From 4afb330453f1d681462aa1dee0b4fed49c80c667 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Wed, 12 Jul 2017 10:10:01 -0600 Subject: 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/parameter_validation_generator.py') diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py index 49a002ce..5a945f72 100644 --- a/scripts/parameter_validation_generator.py +++ b/scripts/parameter_validation_generator.py @@ -793,11 +793,11 @@ class ParamCheckerOutputGenerator(OutputGenerator): 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 -- cgit v1.2.3