diff options
| author | Mike Schuchardt <mikes@lunarg.com> | 2017-07-12 10:10:01 -0600 |
|---|---|---|
| committer | Mark Young <marky@lunarg.com> | 2017-07-13 11:01:16 -0600 |
| commit | 4afb330453f1d681462aa1dee0b4fed49c80c667 (patch) | |
| tree | 63c70c73f83fedc75cd8bbc9147cd0cfb552f914 /scripts/parameter_validation_generator.py | |
| parent | 2c4bbf3f049e561125501baab93c79d149d49394 (diff) | |
| download | usermoji-4afb330453f1d681462aa1dee0b4fed49c80c667.tar.xz | |
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
Diffstat (limited to 'scripts/parameter_validation_generator.py')
| -rw-r--r-- | scripts/parameter_validation_generator.py | 6 |
1 files changed, 3 insertions, 3 deletions
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 |