From c3f5c4811547fbcee262a7c49955d707588df10a Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 8 Jul 2015 21:13:16 -0600 Subject: loader: use device extension list, not global When validating the PhysicalDevice extensions really need to use the device extension list not the loader's global list. --- loader/loader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/loader/loader.c b/loader/loader.c index 8fe2d3ac..50b55843 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2330,6 +2330,7 @@ VkResult loader_validate_instance_extensions( VkResult loader_validate_device_extensions( struct loader_icd *icd, + u_int32_t gpu_index, const VkDeviceCreateInfo *pCreateInfo) { struct loader_extension_property *extension_prop; @@ -2338,7 +2339,7 @@ VkResult loader_validate_device_extensions( for (uint32_t i = 0; i < pCreateInfo->extensionCount; i++) { const char *extension_name = pCreateInfo->ppEnabledExtensionNames[i]; extension_prop = get_extension_property(extension_name, - &loader.global_extensions); + &icd->device_extension_cache[gpu_index]); if (extension_prop) { continue; @@ -2774,7 +2775,7 @@ VkResult loader_CreateDevice( return res; } - res = loader_validate_device_extensions(icd, pCreateInfo); + res = loader_validate_device_extensions(icd, gpu_index, pCreateInfo); if (res != VK_SUCCESS) { return res; } -- cgit v1.2.3