loader: Improve 1.2 promoted extension fix

Change-Id: I33ea7c685c0d91119fed20b503408c7709210833

diff --git a/scripts/loader_extension_generator.py b/scripts/loader_extension_generator.py
index 5fbbd5e6c3d0c5a6e00a6c6de2f1c4949b8f3b27..8bcd999adb74fd098a65add3092670fb909b70b5 100644 (file)
--- a/scripts/loader_extension_generator.py
+++ b/scripts/loader_extension_generator.py
@@ -66,7 +66,7 @@ DEVICE_CMDS_NEED_TERM = ['vkGetDeviceProcAddr',
                          'vkGetDeviceGroupSurfacePresentModes2EXT']
 
 ALIASED_CMDS = {
-    # 1.1 aliases
+    # 1.1 aliases, specifically for APIs taking instance/pdev dispatchable objects
     'vkEnumeratePhysicalDeviceGroupsKHR':                   'vkEnumeratePhysicalDeviceGroups',
     'vkGetPhysicalDeviceFeatures2KHR':                      'vkGetPhysicalDeviceFeatures2',
     'vkGetPhysicalDeviceProperties2KHR':                    'vkGetPhysicalDeviceProperties2',
@@ -78,21 +78,6 @@ ALIASED_CMDS = {
     'vkGetPhysicalDeviceExternalBufferPropertiesKHR':       'vkGetPhysicalDeviceExternalBufferProperties',
     'vkGetPhysicalDeviceExternalSemaphorePropertiesKHR':    'vkGetPhysicalDeviceExternalSemaphoreProperties',
     'vkGetPhysicalDeviceExternalFencePropertiesKHR':        'vkGetPhysicalDeviceExternalFenceProperties',
-    
-    # 1.2 aliases
-    'vkCreateRenderPass2KHR':                               'vkCreateRenderPass2',
-    'vkCmdBeginRenderPass2KHR':                             'vkCmdBeginRenderPass2',
-    'vkCmdNextSubpass2KHR':                                 'vkCmdNextSubpass2',
-    'vkCmdEndRenderPass2KHR':                               'vkCmdEndRenderPass2',
-    'vkCmdDrawIndirectCountKHR':                            'vkCmdDrawIndirectCount',
-    'vkCmdDrawIndexedIndirectCountKHR':                     'vkCmdDrawIndexedIndirectCount',
-    'vkGetSemaphoreCounterValueKHR':                        'vkGetSemaphoreCounterValue',
-    'vkWaitSemaphoresKHR':                                  'vkWaitSemaphores',
-    'vkSignalSemaphoreKHR':                                 'vkSignalSemaphore',
-    'vkGetBufferDeviceAddressKHR':                          'vkGetBufferDeviceAddress',
-    'vkGetBufferOpaqueCaptureAddressKHR':                   'vkGetBufferOpaqueCaptureAddress',
-    'vkGetDeviceMemoryOpaqueCaptureAddressKHR':             'vkGetDeviceMemoryOpaqueCaptureAddress',
-    'vkResetQueryPoolEXT':                                  'vkResetQueryPool',
 }
 
 PRE_INSTANCE_FUNCTIONS = ['vkEnumerateInstanceExtensionProperties',
@@ -1391,7 +1376,7 @@ class LoaderExtensionOutputGenerator(OutputGenerator):
                 gpa_func += '    }\n'
             else:
                 gpa_func += '    if (!strcmp("%s", name)) {\n' % (cur_cmd.name)
-                gpa_func += '        *addr = (void *)%s;\n' % (cur_cmd.name[2:])
+                gpa_func += '        *addr = (void *)%s;\n' % (base_name)
                 gpa_func += '        return true;\n'
                 gpa_func += '    }\n'