commit fbdd1af82477952cba209a4c6a9f71d0ef25c08b
author Locke <locke@lunarg.com> Tue Apr 16 15:07:23 2019 -0600
committer Locke Lin <47329816+locke-lunarg@users.noreply.github.com> Mon Apr 22 14:44:08 2019 -0600
tree 37482e64f2a90a1b923826ad78c8edfae0f2d175
parent 3ca54c2989dac3aa4a801c02c721d81b66a0bef8

layers: Replace GenericHeader

Replace GenericHeader into VkBaseOutStructure.

Change-Id: I46481b083cf404e0ed946c384ddc031ac64b795e

layers/stateless_validation.h

diff --git a/layers/stateless_validation.h b/layers/stateless_validation.h
index 0877701..55dcd10 100644
--- a/layers/stateless_validation.h
+++ b/layers/stateless_validation.h
@@ -63,11 +63,6 @@
 extern const std::vector<VkBorderColor> AllVkBorderColorEnums;
 extern const std::vector<VkImageLayout> AllVkImageLayoutEnums;
 
-struct GenericHeader {
-    VkStructureType sType;
-    const void *pNext;
-};
-
 // String returned by string_VkStructureType for an unrecognized type.
 const std::string UnsupportedStructureTypeString = "Unhandled VkStructureType";
 
@@ -474,7 +469,7 @@
     }
 
     // Forward declaration for pNext validation
-    bool ValidatePnextStructContents(const char *api_name, const ParameterName &parameter_name, const GenericHeader *header);
+    bool ValidatePnextStructContents(const char *api_name, const ParameterName &parameter_name, const VkBaseOutStructure *header);
 
     /**
      * Validate a structure's pNext member.
@@ -521,7 +516,7 @@
             } else {
                 const VkStructureType *start = allowed_types;
                 const VkStructureType *end = allowed_types + allowed_type_count;
-                const GenericHeader *current = reinterpret_cast<const GenericHeader *>(next);
+                const VkBaseOutStructure *current = reinterpret_cast<const VkBaseOutStructure *>(next);
 
                 cycle_check.insert(next);
 
@@ -574,7 +569,7 @@
                         }
                         skip_call |= ValidatePnextStructContents(api_name, parameter_name, current);
                     }
-                    current = reinterpret_cast<const GenericHeader *>(current->pNext);
+                    current = reinterpret_cast<const VkBaseOutStructure *>(current->pNext);
                 }
             }
         }