commit 160e66b55a385eec961187b6e422417541c25608
author Lenny Komow <lenny@lunarg.com> Tue Aug 20 16:39:08 2019 -0600
committer Lenny Komow <lenny@lunarg.com> Wed Aug 28 11:04:48 2019 -0600
tree 3bd1359eb496a6833f77181115518862816e36cf
parent 23c3bca209ddea16504f32e995d35f260212b7bc

loader: Check JSON API version in create instance

Some old drivers crash when calling vkGetInstanceProcAddr to get the
vkEnumerateInstanceVersion entry point. This checks that the JSON
API version is 1.1 before doing that to avoid the crash

Change-Id: I85eac4e1ee38222c936c63484fb9f4353ba55ab0

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index c5082bc..ef0d392 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -6140,16 +6140,18 @@
 
         // Get the driver version from vkEnumerateInstanceVersion
         uint32_t icd_version = VK_API_VERSION_1_0;
-        PFN_vkEnumerateInstanceVersion icd_enumerate_instance_version = (PFN_vkEnumerateInstanceVersion)
-            icd_term->scanned_icd->GetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion");
         VkResult icd_result = VK_SUCCESS;
-        if (icd_enumerate_instance_version != NULL) {
-            icd_result = icd_enumerate_instance_version(&icd_version);
-            if (icd_result != VK_SUCCESS) {
-                icd_version = VK_API_VERSION_1_0;
-                loader_log(ptr_instance, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, "terminator_CreateInstance: ICD \"%s\" "
-                    "vkEnumerateInstanceVersion returned error. The ICD will be treated as a 1.0 ICD",
-                    icd_term->scanned_icd->lib_name);
+        if (icd_term->scanned_icd->api_version >= VK_API_VERSION_1_1) {
+            PFN_vkEnumerateInstanceVersion icd_enumerate_instance_version = (PFN_vkEnumerateInstanceVersion)
+                icd_term->scanned_icd->GetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion");
+            if (icd_enumerate_instance_version != NULL) {
+                icd_result = icd_enumerate_instance_version(&icd_version);
+                if (icd_result != VK_SUCCESS) {
+                    icd_version = VK_API_VERSION_1_0;
+                    loader_log(ptr_instance, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, "terminator_CreateInstance: ICD \"%s\" "
+                        "vkEnumerateInstanceVersion returned error. The ICD will be treated as a 1.0 ICD",
+                        icd_term->scanned_icd->lib_name);
+                }
             }
         }