For specifically AMD drivers that have a version in their JSON, assum…

…e they are 1.0 unless the JSON says 1.1
hg-ctangora · Aug 18, 2019 · 3e917fe · 3e917fe
1 parent 74a45b5
commit 3e917fe
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/loader/loader.c b/loader/loader.c
@@ -5813,8 +5813,10 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateInstance(const VkInstanceCreateI
         // Get the driver version from vkEnumerateInstanceVersion
         uint32_t icd_version = VK_API_VERSION_1_0;
         VkResult icd_result = VK_SUCCESS;
+        bool is_amd = (strstr(icd_term->scanned_icd->lib_name, "amdvlk") != NULL);
 
-        if (icd_term->scanned_icd->api_version > 0) {
+        if (icd_term->scanned_icd->api_version > 0 && 
+            (!is_amd || 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) {