loader: Update vkEnumerateInstanceVersion for 1.1

diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 26a7646e44bd0995db4d395999462ab2f0af4ab0..463e352bd538fca5ed3c9517e89cf679baeaf24b 100644 (file)
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -164,7 +164,6 @@ static inline void *trampolineGetProcAddr(struct loader_instance *inst, const ch
     if (!strcmp(funcName, "vkCmdExecuteCommands")) return (PFN_vkVoidFunction)vkCmdExecuteCommands;
 
     // Core 1.1 functions
-    if (!strcmp(funcName, "vkEnumerateInstanceVersion")) return (PFN_vkVoidFunction)vkEnumerateInstanceVersion;
     if (!strcmp(funcName, "vkEnumeratePhysicalDeviceGroups")) return (PFN_vkVoidFunction)vkEnumeratePhysicalDeviceGroups;
     if (!strcmp(funcName, "vkGetPhysicalDeviceFeatures2")) return (PFN_vkVoidFunction)vkGetPhysicalDeviceFeatures2;
     if (!strcmp(funcName, "vkGetPhysicalDeviceProperties2")) return (PFN_vkVoidFunction)vkGetPhysicalDeviceProperties2;
@@ -211,6 +210,7 @@ static inline void *globalGetProcAddr(const char *name) {
     if (!strcmp(name, "CreateInstance")) return (void *)vkCreateInstance;
     if (!strcmp(name, "EnumerateInstanceExtensionProperties")) return (void *)vkEnumerateInstanceExtensionProperties;
     if (!strcmp(name, "EnumerateInstanceLayerProperties")) return (void *)vkEnumerateInstanceLayerProperties;
+    if (!strcmp(name, "EnumerateInstanceVersion")) return (void *)vkEnumerateInstanceVersion;
 
     return NULL;
 }

diff --git a/loader/trampoline.c b/loader/trampoline.c
index 8968dc4c95d9c8e3c19082316279a99e7c75eddd..f0f9bf5944afbcd2bd526db892ec1cff3e00b2d3 100644 (file)
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -33,6 +33,10 @@
 #include "vk_loader_extensions.h"
 #include "gpa_helper.h"
 
+// This loader only supports Vulkan API version 1.0
+uint32_t loader_major_version = 1;
+uint32_t loader_minor_version = 1;
+
 // Trampoline entrypoints are in this file for core Vulkan commands
 
 // Get an instance level or global level entry point address.