codegen: Generate vulkan handle wrapping to endFile

Generate the Vulkan struct handle wrapping content at endFile time
instead of generate_feature time.

Author: MarkY-LunarG

framework/generated/khronos_generators/vulkan_generators/vulkan_struct_handle_wrappers_body_generator.py

@@ -95,6 +95,35 @@ def beginFile(self, gen_opts):
 
     def endFile(self):
         """Method override."""
+        for struct in self.get_all_filtered_struct_names():
+            if (
+                (struct in self.structs_with_handles)
+                or (struct in self.GENERIC_HANDLE_STRUCTS)
+            ) and (struct not in self.STRUCT_MAPPERS_BLACKLIST):
+                handle_members = dict()
+                generic_handle_members = dict()
+
+                if struct in self.structs_with_handles:
+                    handle_members = self.structs_with_handles[struct]
+                if struct in self.GENERIC_HANDLE_STRUCTS:
+                    generic_handle_members = self.GENERIC_HANDLE_STRUCTS[struct
+                                                                         ]
+
+                body = '\n'
+                body += 'void UnwrapStructHandles({}* value, HandleUnwrapMemory* unwrap_memory)\n'.format(
+                    struct
+                )
+                body += '{\n'
+                body += '    if (value != nullptr)\n'
+                body += '    {\n'
+                body += self.make_struct_handle_unwrappings(
+                    struct, handle_members, generic_handle_members
+                )
+                body += '    }\n'
+                body += '}'
+
+                write(body, file=self.outFile)
+
         # Generate the pNext shallow copy code, for pNext structs that don't have handles, but need to be preserved in the overall copy for handle wrapping.
         self.newline()
         write(
@@ -233,37 +262,6 @@ def need_feature_generation(self):
             return True
         return False
 
-    def generate_feature(self):
-        """Performs C++ code generation for the feature."""
-        for struct in self.get_filtered_struct_names():
-            if (
-                (struct in self.structs_with_handles)
-                or (struct in self.GENERIC_HANDLE_STRUCTS)
-            ) and (struct not in self.STRUCT_MAPPERS_BLACKLIST):
-                handle_members = dict()
-                generic_handle_members = dict()
-
-                if struct in self.structs_with_handles:
-                    handle_members = self.structs_with_handles[struct]
-                if struct in self.GENERIC_HANDLE_STRUCTS:
-                    generic_handle_members = self.GENERIC_HANDLE_STRUCTS[struct
-                                                                         ]
-
-                body = '\n'
-                body += 'void UnwrapStructHandles({}* value, HandleUnwrapMemory* unwrap_memory)\n'.format(
-                    struct
-                )
-                body += '{\n'
-                body += '    if (value != nullptr)\n'
-                body += '    {\n'
-                body += self.make_struct_handle_unwrappings(
-                    struct, handle_members, generic_handle_members
-                )
-                body += '    }\n'
-                body += '}'
-
-                write(body, file=self.outFile)
-
     def make_struct_handle_unwrappings(
         self, name, handle_members, generic_handle_members
     ):

framework/generated/khronos_generators/vulkan_generators/vulkan_struct_handle_wrappers_header_generator.py

@@ -100,6 +100,30 @@ def beginFile(self, gen_opts):
 
     def endFile(self):
         """Method override."""
+        # Check for output structures, which retrieve handles that need to be wrapped.
+        for cmd in self.all_cmd_params:
+            info = self.all_cmd_params[cmd]
+            values = info[2]
+
+            for value in values:
+                if self.is_output_parameter(value) and self.is_struct(
+                    value.base_type
+                ) and (value.base_type in self.structs_with_handles
+                       ) and (value.base_type not in self.output_structs):
+                    self.output_structs.append(value.base_type)
+
+        # Generate unwrap and rewrap code for input structures.
+        for struct in self.get_all_filtered_struct_names():
+            if (
+                (struct in self.structs_with_handles)
+                or (struct in self.GENERIC_HANDLE_STRUCTS)
+            ) and (struct not in self.STRUCT_MAPPERS_BLACKLIST):
+                body = '\n'
+                body += 'void UnwrapStructHandles({}* value, HandleUnwrapMemory* unwrap_memory);'.format(
+                    struct
+                )
+                write(body, file=self.outFile)
+
         self.newline()
         write(
             'VkBaseInStructure* CopyPNextStruct(const VkBaseInStructure* base, HandleUnwrapMemory* unwrap_memory);',
@@ -235,32 +259,6 @@ def need_feature_generation(self):
             return True
         return False
 
-    def generate_feature(self):
-        """Performs C++ code generation for the feature."""
-        # Check for output structures, which retrieve handles that need to be wrapped.
-        for cmd in self.feature_cmd_params:
-            info = self.feature_cmd_params[cmd]
-            values = info[2]
-
-            for value in values:
-                if self.is_output_parameter(value) and self.is_struct(
-                    value.base_type
-                ) and (value.base_type in self.structs_with_handles
-                       ) and (value.base_type not in self.output_structs):
-                    self.output_structs.append(value.base_type)
-
-        # Generate unwrap and rewrap code for input structures.
-        for struct in self.get_filtered_struct_names():
-            if (
-                (struct in self.structs_with_handles)
-                or (struct in self.GENERIC_HANDLE_STRUCTS)
-            ) and (struct not in self.STRUCT_MAPPERS_BLACKLIST):
-                body = '\n'
-                body += 'void UnwrapStructHandles({}* value, HandleUnwrapMemory* unwrap_memory);'.format(
-                    struct
-                )
-                write(body, file=self.outFile)
-
     def generate_create_wrapper_funcs(self):
         """Generates functions that wrap struct handle members."""
         for struct in self.output_structs: