From 87bf8bb455d56e9833b33a94384388232e8c6b4e Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Sun, 23 Jul 2017 12:47:47 -0600 Subject: scripts: Switch codegen to use structextends Replace all usages of the deprecated validextensionstructs member attribute with the registry.validextensionstructs dict. Internally the registry builds this extension dictionary using the new structextends type attribute. Change-Id: I072ff707bfdfa1f576266291e4196837da526287 --- scripts/parameter_validation_generator.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'scripts/parameter_validation_generator.py') diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py index 5a945f72..f1dfba1f 100644 --- a/scripts/parameter_validation_generator.py +++ b/scripts/parameter_validation_generator.py @@ -422,7 +422,7 @@ class ParamCheckerOutputGenerator(OutputGenerator): iscount=iscount, noautovalidity=noautovalidity, len=self.getLen(member), - extstructs=member.attrib.get('validextensionstructs') if name == 'pNext' else None, + extstructs=self.registry.validextensionstructs[typeName] if name == 'pNext' else None, condition=conditions[name] if conditions and name in conditions else None, cdecl=cdecl)) self.structMembers.append(self.StructMemberData(name=typeName, members=membersInfo)) @@ -795,9 +795,8 @@ class ParamCheckerOutputGenerator(OutputGenerator): if value.extstructs: extStructVar = 'allowed_structs_{}'.format(struct_type_name) extStructCount = 'ARRAY_SIZE({})'.format(extStructVar) - structs = value.extstructs.split(',') - extStructNames = '"' + ', '.join(structs) + '"' - checkExpr.append('const VkStructureType {}[] = {{ {} }};\n'.format(extStructVar, ', '.join([self.getStructType(s) for s in structs]))) + extStructNames = '"' + ', '.join(value.extstructs) + '"' + checkExpr.append('const VkStructureType {}[] = {{ {} }};\n'.format(extStructVar, ', '.join([self.getStructType(s) for s in value.extstructs]))) 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