codegen: Update more Vulkan to generate at endFile

Update more Vulkan python scripts to generate at endFile time instead
of generate_feature time.

Author: MarkY-LunarG

framework/generated/khronos_generators/vulkan_generators/layer_func_table_generator.py

@@ -109,6 +109,18 @@ def beginFile(self, gen_opts):
 
     def endFile(self):
         """Method override."""
+        for cmd in self.get_all_filtered_cmd_names():
+            align = 100 - len(cmd)
+            if (cmd in self.LAYER_FUNCTIONS):
+                body = '    {{ "{}",{}reinterpret_cast<PFN_vkVoidFunction>(vulkan_entry::{}) }},'.format(
+                    cmd, (' ' * align), cmd[2:]
+                )
+            else:
+                body = '    {{ "{}",{}reinterpret_cast<PFN_vkVoidFunction>(encode::{}) }},'.format(
+                    cmd, (' ' * align), cmd[2:]
+                )
+            write(body, file=self.outFile)
+
         # Manually output the physical device proc address function as its name doesn't
         # match the scheme used by self.LAYER_FUNCTIONS:
         align = 100 - len('vk_layerGetPhysicalDeviceProcAddr')
@@ -126,17 +138,3 @@ def need_feature_generation(self):
         if self.feature_cmd_params:
             return True
         return False
-
-    def generate_feature(self):
-        """Performs C++ code generation for the feature."""
-        for cmd in self.get_filtered_cmd_names():
-            align = 100 - len(cmd)
-            if (cmd in self.LAYER_FUNCTIONS):
-                body = '    {{ "{}",{}reinterpret_cast<PFN_vkVoidFunction>(vulkan_entry::{}) }},'.format(
-                    cmd, (' ' * align), cmd[2:]
-                )
-            else:
-                body = '    {{ "{}",{}reinterpret_cast<PFN_vkVoidFunction>(encode::{}) }},'.format(
-                    cmd, (' ' * align), cmd[2:]
-                )
-            write(body, file=self.outFile)

framework/generated/khronos_generators/vulkan_generators/vulkan_decoder_header_generator.py

@@ -109,6 +109,13 @@ def beginFile(self, gen_opts):
 
     def endFile(self):
         """Method override."""
+        for cmd in self.get_all_filtered_cmd_names():
+            cmddef = '\n'
+            cmddef += '    size_t Decode_{}(const ApiCallInfo& call_info, const uint8_t* parameter_buffer, size_t buffer_size);'.format(
+                cmd
+            )
+            write(cmddef, file=self.outFile)
+
         write('};', file=self.outFile)
         self.newline()
         write('GFXRECON_END_NAMESPACE(decode)', file=self.outFile)
@@ -122,12 +129,3 @@ def need_feature_generation(self):
         if self.feature_cmd_params:
             return True
         return False
-
-    def generate_feature(self):
-        """Performs C++ code generation for the feature."""
-        for cmd in self.get_filtered_cmd_names():
-            cmddef = '\n'
-            cmddef += '    size_t Decode_{}(const ApiCallInfo& call_info, const uint8_t* parameter_buffer, size_t buffer_size);'.format(
-                cmd
-            )
-            write(cmddef, file=self.outFile)

framework/generated/khronos_generators/vulkan_generators/vulkan_dispatch_table_generator.py

@@ -108,6 +108,29 @@ def beginFile(self, gen_opts):
 
     def endFile(self):
         """Method override."""
+        for name in self.all_cmd_params:
+            # Ignore vkCreateInstance and vkCreateDevice, which are provided by the layer due to special handling requirements
+            if name not in ['vkCreateInstance', 'vkCreateDevice']:
+                info = self.all_cmd_params[name]
+                values = info[2]
+
+                if values and values[0]:
+                    first_param = values[0]
+                    if self.is_handle(first_param.base_type):
+                        return_type = info[0]
+                        proto = info[1]
+
+                        # vkSetDebugUtilsObjectNameEXT and vkSetDebugUtilsObjectTagEXT
+                        # need to be probed from GetInstanceProcAddress due to a loader issue.
+                        # https://github.com/KhronosGroup/Vulkan-Loader/issues/1109
+                        # TODO : When loader with fix for issue is widely available, remove this
+                        # special case.
+                        if name in ['vkSetDebugUtilsObjectNameEXT', 'vkSetDebugUtilsObjectTagEXT']:
+                            self.instance_cmd_names[name] = self.make_cmd_decl(return_type, proto, values, name)
+                        elif first_param.base_type not in ['VkInstance', 'VkPhysicalDevice']:
+                            self.device_cmd_names[name] = self.make_cmd_decl(return_type, proto, values, name)
+                        else:
+                            self.instance_cmd_names[name] = self.make_cmd_decl(return_type, proto, values, name)
         self.newline()
 
         write('typedef const void* VulkanDispatchKey;', file=self.outFile)
@@ -188,32 +211,6 @@ def need_feature_generation(self):
             return True
         return False
 
-    def generate_feature(self):
-        """Performs C++ code generation for the feature."""
-        for name in self.feature_cmd_params:
-            # Ignore vkCreateInstance and vkCreateDevice, which are provided by the layer due to special handling requirements
-            if name not in ['vkCreateInstance', 'vkCreateDevice']:
-                info = self.feature_cmd_params[name]
-                values = info[2]
-
-                if values and values[0]:
-                    first_param = values[0]
-                    if self.is_handle(first_param.base_type):
-                        return_type = info[0]
-                        proto = info[1]
-
-                        # vkSetDebugUtilsObjectNameEXT and vkSetDebugUtilsObjectTagEXT
-                        # need to be probed from GetInstanceProcAddress due to a loader issue.
-                        # https://github.com/KhronosGroup/Vulkan-Loader/issues/1109
-                        # TODO : When loader with fix for issue is widely available, remove this
-                        # special case.
-                        if name in ['vkSetDebugUtilsObjectNameEXT', 'vkSetDebugUtilsObjectTagEXT']:
-                            self.instance_cmd_names[name] = self.make_cmd_decl(return_type, proto, values, name)
-                        elif first_param.base_type not in ['VkInstance', 'VkPhysicalDevice']:
-                            self.device_cmd_names[name] = self.make_cmd_decl(return_type, proto, values, name)
-                        else:
-                            self.instance_cmd_names[name] = self.make_cmd_decl(return_type, proto, values, name)
-
     def generate_instance_cmd_table(self):
         """Generate instance dispatch table structure."""
         write('struct VulkanInstanceTable', file=self.outFile)