diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-11-19 09:29:51 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-11-19 10:47:41 -0700 |
| commit | 1673831fa0c2498ff231cfdd3c51c202087e5067 (patch) | |
| tree | 9437642a0f08e6c78adcf7d8525347839b9ad5e5 /loader | |
| parent | 9c07cc74074694d94f346559113a5fbe69831f01 (diff) | |
| download | usermoji-1673831fa0c2498ff231cfdd3c51c202087e5067.tar.xz | |
loader: Don't init icds if CreateInstance() from ICD fails.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/loader/loader.c b/loader/loader.c index 6b991504..cc64e593 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2877,7 +2877,7 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_CreateInstance( char **filtered_extension_names = NULL; VkInstanceCreateInfo icd_create_info; VkResult res = VK_SUCCESS; - bool success; + bool success = false; icd_create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; icd_create_info.enabledLayerNameCount = 0; @@ -2914,7 +2914,8 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_CreateInstance( res = ptr_instance->icd_libs.list[i].CreateInstance(&icd_create_info, pAllocator, &(icd->instance)); - success = loader_icd_init_entrys( + if (res == VK_SUCCESS) + success = loader_icd_init_entrys( icd, icd->instance, ptr_instance->icd_libs.list[i].GetInstanceProcAddr); |