commit 055c28dd47864307c6a1799b5063480ea96141c2
author Mike Weiblen <mikew@lunarg.com> Thu Feb 27 12:12:38 2020 -0700
committer Mike Weiblen (LunarG) <mikew-lunarg@users.noreply.github.com> Fri Mar 27 10:17:05 2020 -0600
tree 75ec9f6d5c7bd5458b716aa20fa2903de0ad46f4
parent cc481ef276315d54db4381b2d5dffac2b5824cbf

loader: Use complete version from header

Change-Id: I97b4f2aa42f24cea082ac574dfcedd853f02caf8

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index ada3faf..143be13 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -124,10 +124,6 @@
 
 LOADER_PLATFORM_THREAD_ONCE_DECLARATION(once_init);
 
-// This loader supports Vulkan API version 1.1
-uint32_t loader_major_version = 1;
-uint32_t loader_minor_version = 2;
-
 void *loader_instance_heap_alloc(const struct loader_instance *instance, size_t size, VkSystemAllocationScope alloc_scope) {
     void *pMemory = NULL;
 #if (DEBUG_DISABLE_APP_ALLOCATORS == 1)
@@ -1078,11 +1074,11 @@
 
 // Given string of three part form "maj.min.pat" convert to a vulkan version number.
 static uint32_t loader_make_version(char *vers_str) {
-    uint32_t vers = 0, major = 0, minor = 0, patch = 0;
+    uint32_t major = 0, minor = 0, patch = 0;
     char *vers_tok;
 
     if (!vers_str) {
-        return vers;
+        return 0;
     }
 
     vers_tok = strtok(vers_str, ".\"\n\r");
@@ -6589,7 +6585,7 @@
     if (!dev->extensions.khr_device_group_enabled) {
         VkPhysicalDeviceProperties properties;
         icd_term->dispatch.GetPhysicalDeviceProperties(phys_dev_term->phys_dev, &properties);
-        if (properties.apiVersion >= VK_MAKE_VERSION(1, 1, 0)) {
+        if (properties.apiVersion >= VK_API_VERSION_1_1) {
             dev->extensions.khr_device_group_enabled = true;
         }
     }
@@ -7244,7 +7240,7 @@
 terminator_EnumerateInstanceVersion(const VkEnumerateInstanceVersionChain *chain, uint32_t* pApiVersion) {
     // NOTE: The Vulkan WG doesn't want us checking pApiVersion for NULL, but instead
     // prefers us crashing.
-    *pApiVersion = VK_MAKE_VERSION(loader_major_version, loader_minor_version, VK_HEADER_VERSION);
+    *pApiVersion = VK_HEADER_VERSION_COMPLETE;
     return VK_SUCCESS;
 }