commit 1d0d15580070ae778c8a1f0c26cf023af8f5ef4a
author Mike Schuchardt <mikes@lunarg.com> Wed Jul 12 10:10:01 2017 -0600
committer Mark Young <marky@lunarg.com> Thu Jul 13 11:00:27 2017 -0600
tree 90be677a41d2ebd74c0ed428ea4f7810ae9c88e5
parent f927d277b6fd29478656c7518f842395219a4584

layers: Update PV codegen for Windows warning

Code gen declarations of allowed_structs in nested scopes could cause
warnings in Windows.  Modified codegen to append the type name to
allowed_structs (eg allowed_structs_VkGraphicsPipelineCreateInfo) to
avoid name collisions.

Change-Id: I40bd57ff34dcd1df01d3606c79dacbe06b00f464

scripts/parameter_validation_generator.py

diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
index 49a002c..5a945f7 100644
--- a/scripts/parameter_validation_generator.py
+++ b/scripts/parameter_validation_generator.py
@@ -793,11 +793,11 @@
         extStructNames = 'NULL'
         vuid = self.GetVuid("VUID-%s-pNext-pNext" % struct_type_name)
         if value.extstructs:
+            extStructVar = 'allowed_structs_{}'.format(struct_type_name)
+            extStructCount = 'ARRAY_SIZE({})'.format(extStructVar)
             structs = value.extstructs.split(',')
-            checkExpr.append('const VkStructureType allowedStructs[] = {' + ', '.join([self.getStructType(s) for s in structs]) + '};\n')
-            extStructCount = 'ARRAY_SIZE(allowedStructs)'
-            extStructVar = 'allowedStructs'
             extStructNames = '"' + ', '.join(structs) + '"'
+            checkExpr.append('const VkStructureType {}[] = {{ {} }};\n'.format(extStructVar, ', '.join([self.getStructType(s) for s in structs])))
         checkExpr.append('skipCall |= validate_struct_pnext(layer_data->report_data, "{}", {ppp}"{}"{pps}, {}, {}{}, {}, {}, GeneratedHeaderVersion, {});\n'.format(
             funcPrintName, valuePrintName, extStructNames, prefix, value.name, extStructCount, extStructVar, vuid, **postProcSpec))
         return checkExpr