commit 6b6b73848bb0e4118c802e18003dc6082361c07e
author Locke <locke@lunarg.com> Tue Apr 16 15:08:49 2019 -0600
committer Locke Lin <47329816+locke-lunarg@users.noreply.github.com> Mon Apr 22 14:44:08 2019 -0600
tree 5fc652c8b2a1408cbfcd0934483d057eafeaffbc
parent fbdd1af82477952cba209a4c6a9f71d0ef25c08b

scripts: Replace GenericHeader

Replace GenericHeader into VkBaseOutStructure.

Change-Id: Id4dc57ba4740916e27c2dab73c8efa7767f3180e

scripts/helper_file_generator.py

diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py
index e577ca6..c0c9cbe 100644
--- a/scripts/helper_file_generator.py
+++ b/scripts/helper_file_generator.py
@@ -1136,7 +1136,7 @@
         type_member = 'Type'
         id_member = 'kSType'
         id_decl = 'static const VkStructureType '
-        generic_header = prefix + 'GenericHeader'
+        generic_header = 'VkBaseOutStructure'
         typename_func = fprefix + 'typename'
         idname_func = fprefix + 'stype_name'
         find_func = fprefix + 'find_in_chain'
@@ -1160,12 +1160,6 @@
 
         # Define the utilities (here so any renaming stays consistent), if this grows large, refactor to a fixed .h file
         utilities_format = '\n'.join((
-            '// Header "base class" for pNext chain traversal',
-            'struct {header} {{',
-            '   VkStructureType sType;',
-            '   const {header} *pNext;',
-            '}};',
-            '',
             '// Find an entry of the given type in the pNext chain',
             'template <typename T> const T *{find_func}(const void *next) {{',
             '    const {header} *current = reinterpret_cast<const {header} *>(next);',