Modify Python

1. Remove "or self.struct_names" in "vulkan_consumer_header_generator"
This generator is to generate code for functions,
so it's not for structures.

2. Set protect_file is True to generator "#ifndef" and "#define",
instead of "#pragma once"

3. Modifiy ".h" to "\.h" in "base_generator" to fix "DISPAT_H" to "DISPATCH".

Author: locke-lunarg

framework/generated/generated_vulkan_consumer.h

@@ -27,7 +27,8 @@
 **
 */
 
-#pragma once
+#ifndef  GFXRECON_GENERATED_VULKAN_CPP_CONSUMER_EXTENSION_H
+#define  GFXRECON_GENERATED_VULKAN_CPP_CONSUMER_EXTENSION_H
 
 #include "util/defines.h"
 #include "vulkan/vulkan.h"
@@ -50,3 +51,5 @@ std::string GenerateExtension(std::ostream& out, const void* struct_info, void*
 
 GFXRECON_END_NAMESPACE(decode)
 GFXRECON_END_NAMESPACE(gfxrecon)
+
+#endif

framework/generated/generated_vulkan_cpp_consumer_extension.h

@@ -27,7 +27,8 @@
 **
 */
 
-#pragma once
+#ifndef  GFXRECON_GENERATED_VULKAN_CPP_STRUCTS_H
+#define  GFXRECON_GENERATED_VULKAN_CPP_STRUCTS_H
 
 #include "util/defines.h"
 #include "vulkan/vulkan.h"
@@ -1989,3 +1990,5 @@ std::string GenerateStruct_VkPhysicalDeviceMeshShaderPropertiesEXT(std::ostream
 GFXRECON_END_NAMESPACE(decode)
 GFXRECON_END_NAMESPACE(gfxrecon)
 
+
+#endif

framework/generated/generated_vulkan_cpp_structs.h

@@ -27,8 +27,8 @@
 **
 */
 
-#ifndef  GFXRECON_GENERATED_VULKAN_DISPAT_H_TABLE_H
-#define  GFXRECON_GENERATED_VULKAN_DISPAT_H_TABLE_H
+#ifndef  GFXRECON_GENERATED_VULKAN_DISPATCH_TABLE_H
+#define  GFXRECON_GENERATED_VULKAN_DISPATCH_TABLE_H
 
 #include "format/platform_types.h"
 #include "util/defines.h"

framework/generated/generated_vulkan_dispatch_table.h

@@ -27,6 +27,9 @@
 **
 */
 
+#ifndef  GFXRECON_GENERATED_VULKAN_REFERENCED_RESOURCE_CONSUMER_H
+#define  GFXRECON_GENERATED_VULKAN_REFERENCED_RESOURCE_CONSUMER_H
+
 #include "decode/vulkan_referenced_resource_consumer_base.h"
 #include "util/defines.h"
 
@@ -698,3 +701,5 @@ class VulkanReferencedResourceConsumer : public VulkanReferencedResourceConsumer
 
 GFXRECON_END_NAMESPACE(decode)
 GFXRECON_END_NAMESPACE(gfxrecon)
+
+#endif

framework/generated/generated_vulkan_json_consumer.h

@@ -439,7 +439,7 @@ def beginFile(self, gen_opts):
 
         # Multiple inclusion protection & C++ wrappers.
         if (gen_opts.protect_file and self.genOpts.filename):
-            header_sym = 'GFXRECON_' + re.sub('.h', '_H', os.path.basename(self.genOpts.filename)
+            header_sym = 'GFXRECON_' + re.sub('\.h', '_H', os.path.basename(self.genOpts.filename)
             ).upper()
             write('#ifndef ', header_sym, file=self.outFile)
             write('#define ', header_sym, file=self.outFile)

framework/generated/generated_vulkan_referenced_resource_consumer.h

@@ -354,7 +354,7 @@ def make_gen_opts(args):
             blacklists=blacklists,
             platform_types=platform_types,
             prefix_text=prefix_strings + vk_prefix_strings,
-            protect_file=False,
+            protect_file=True,
             protect_feature=False,
             extraVulkanHeaders=extraVulkanHeaders
         )
@@ -415,7 +415,7 @@ def make_gen_opts(args):
             blacklists         = blacklists,
             platform_types     = platform_types,
             prefix_text        = prefix_strings + vk_prefix_strings,
-            protect_file       = False,
+            protect_file       = True,
             protect_feature    = False)
     ]
 
@@ -439,7 +439,7 @@ def make_gen_opts(args):
             blacklists        = blacklists,
             platform_types     = platform_types,
             prefix_text        = prefix_strings + vk_prefix_strings,
-            protect_file       = False,
+            protect_file       = True,
             protect_feature    = False)
     ]
 

framework/generated/generated_vulkan_replay_consumer.h

@@ -145,7 +145,7 @@ def endFile(self):
     #
     # Indicates that the current feature has C++ code to generate.
     def need_feature_generation(self):
-        if self.feature_cmd_params or self.struct_names:
+        if self.feature_cmd_params:
             return True
         return False
 

framework/generated/vulkan_generators/base_generator.py

@@ -108,10 +108,6 @@ def beginFile(self, genOpts):
 
         self.is_header = genOpts.filename.endswith(".h")
 
-        if self.is_header:
-            self.writeout('#pragma once')
-            self.newline()
-
         if not self.is_header:
             self.writeout('#include "generated/generated_vulkan_cpp_consumer_extension.h"')
             self.writeout('#include "generated/generated_vulkan_cpp_consumer.h"')

framework/generated/vulkan_generators/gencode.py

@@ -178,8 +178,6 @@ def beginFile(self, genOpts):
         self.is_header = genOpts.filename.endswith(".h")
 
         if self.is_header:
-            self.writeout('#pragma once')
-            self.newline()
             self.writeout('#include "util/defines.h"')
             self.includeVulkanHeaders(genOpts)
             self.newline()