commit 0277a2ca2ba52917534678080da6288d9008d84f
author Mark Lobodzinski <mark@lunarg.com> Wed Jan 22 12:47:46 2020 -0700
committer Mark Lobodzinski <mark@lunarg.com> Wed Jan 22 13:42:56 2020 -0700
tree 88800ae77fe78a1bd4280ed59e9089155bc23430
parent af8c7e040f93a58e368ce477a409238d9728f46c

loader: Fix handling of promoted device extensions

Change-Id: Ia301f1bcde6f9fa7252ee4a665821b4a3d72d269

loader/generated/vk_loader_extensions.c

diff --git a/loader/generated/vk_loader_extensions.c b/loader/generated/vk_loader_extensions.c
index 67b8b57..68f2980 100644
--- a/loader/generated/vk_loader_extensions.c
+++ b/loader/generated/vk_loader_extensions.c
@@ -3518,19 +3518,19 @@
 
     // ---- VK_KHR_create_renderpass2 extension commands
     if (!strcmp("vkCreateRenderPass2KHR", name)) {
-        *addr = (void *)vkCreateRenderPass2;
+        *addr = (void *)CreateRenderPass2KHR;
         return true;
     }
     if (!strcmp("vkCmdBeginRenderPass2KHR", name)) {
-        *addr = (void *)vkCmdBeginRenderPass2;
+        *addr = (void *)CmdBeginRenderPass2KHR;
         return true;
     }
     if (!strcmp("vkCmdNextSubpass2KHR", name)) {
-        *addr = (void *)vkCmdNextSubpass2;
+        *addr = (void *)CmdNextSubpass2KHR;
         return true;
     }
     if (!strcmp("vkCmdEndRenderPass2KHR", name)) {
-        *addr = (void *)vkCmdEndRenderPass2;
+        *addr = (void *)CmdEndRenderPass2KHR;
         return true;
     }
 
@@ -3646,39 +3646,39 @@
 
     // ---- VK_KHR_draw_indirect_count extension commands
     if (!strcmp("vkCmdDrawIndirectCountKHR", name)) {
-        *addr = (void *)vkCmdDrawIndirectCount;
+        *addr = (void *)CmdDrawIndirectCountKHR;
         return true;
     }
     if (!strcmp("vkCmdDrawIndexedIndirectCountKHR", name)) {
-        *addr = (void *)vkCmdDrawIndexedIndirectCount;
+        *addr = (void *)CmdDrawIndexedIndirectCountKHR;
         return true;
     }
 
     // ---- VK_KHR_timeline_semaphore extension commands
     if (!strcmp("vkGetSemaphoreCounterValueKHR", name)) {
-        *addr = (void *)vkGetSemaphoreCounterValue;
+        *addr = (void *)GetSemaphoreCounterValueKHR;
         return true;
     }
     if (!strcmp("vkWaitSemaphoresKHR", name)) {
-        *addr = (void *)vkWaitSemaphores;
+        *addr = (void *)WaitSemaphoresKHR;
         return true;
     }
     if (!strcmp("vkSignalSemaphoreKHR", name)) {
-        *addr = (void *)vkSignalSemaphore;
+        *addr = (void *)SignalSemaphoreKHR;
         return true;
     }
 
     // ---- VK_KHR_buffer_device_address extension commands
     if (!strcmp("vkGetBufferDeviceAddressKHR", name)) {
-        *addr = (void *)vkGetBufferDeviceAddress;
+        *addr = (void *)GetBufferDeviceAddressKHR;
         return true;
     }
     if (!strcmp("vkGetBufferOpaqueCaptureAddressKHR", name)) {
-        *addr = (void *)vkGetBufferOpaqueCaptureAddress;
+        *addr = (void *)GetBufferOpaqueCaptureAddressKHR;
         return true;
     }
     if (!strcmp("vkGetDeviceMemoryOpaqueCaptureAddressKHR", name)) {
-        *addr = (void *)vkGetDeviceMemoryOpaqueCaptureAddress;
+        *addr = (void *)GetDeviceMemoryOpaqueCaptureAddressKHR;
         return true;
     }
 
@@ -4256,7 +4256,7 @@
 
     // ---- VK_EXT_host_query_reset extension commands
     if (!strcmp("vkResetQueryPoolEXT", name)) {
-        *addr = (void *)vkResetQueryPool;
+        *addr = (void *)ResetQueryPoolEXT;
         return true;
     }
     return false;

scripts/loader_extension_generator.py

diff --git a/scripts/loader_extension_generator.py b/scripts/loader_extension_generator.py
index baad5d3..5fbbd5e 100644
--- a/scripts/loader_extension_generator.py
+++ b/scripts/loader_extension_generator.py
@@ -1391,7 +1391,7 @@
                 gpa_func += '    }\n'
             else:
                 gpa_func += '    if (!strcmp("%s", name)) {\n' % (cur_cmd.name)
-                gpa_func += '        *addr = (void *)%s;\n' % (base_name)
+                gpa_func += '        *addr = (void *)%s;\n' % (cur_cmd.name[2:])
                 gpa_func += '        return true;\n'
                 gpa_func += '    }\n'