diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-10-24 13:41:18 -0600 |
|---|---|---|
| committer | Mike Schuchardt <mikes@lunarg.com> | 2018-03-09 13:54:31 -0700 |
| commit | f895bcc8a6896c5aa278c6549dab241e4eb649ef (patch) | |
| tree | 05f70594c865463bd246d08f12496608b8dc418b /scripts/object_tracker_generator.py | |
| parent | 1966df8f8754101aa27f7dab90080bffb69f2398 (diff) | |
| download | usermoji-f895bcc8a6896c5aa278c6549dab241e4eb649ef.tar.xz | |
scripts: Update generators for 1.1
Diffstat (limited to 'scripts/object_tracker_generator.py')
| -rw-r--r-- | scripts/object_tracker_generator.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/object_tracker_generator.py b/scripts/object_tracker_generator.py index dafc00ca..c2217a70 100644 --- a/scripts/object_tracker_generator.py +++ b/scripts/object_tracker_generator.py @@ -24,6 +24,7 @@ import xml.etree.ElementTree as etree from generator import * from collections import namedtuple from vuid_mapping import * +from common_codegen import * # This is a workaround to use a Python 2.7 and 3.x compatible syntax. from io import open @@ -72,34 +73,34 @@ class ObjectTrackerGeneratorOptions(GeneratorOptions): defaultExtensions = None, addExtensions = None, removeExtensions = None, + emitExtensions = None, sortProcedure = regSortFeatures, prefixText = "", genFuncPointers = True, protectFile = True, protectFeature = True, - protectProto = None, - protectProtoStr = None, apicall = '', apientry = '', apientryp = '', indentFuncProto = True, indentFuncPointer = False, - alignFuncParam = 0): + alignFuncParam = 0, + expandEnumerants = True): GeneratorOptions.__init__(self, filename, directory, apiname, profile, versions, emitversions, defaultExtensions, - addExtensions, removeExtensions, sortProcedure) + addExtensions, removeExtensions, emitExtensions, sortProcedure) self.prefixText = prefixText self.genFuncPointers = genFuncPointers self.protectFile = protectFile self.protectFeature = protectFeature - self.protectProto = protectProto - self.protectProtoStr = protectProtoStr self.apicall = apicall self.apientry = apientry self.apientryp = apientryp self.indentFuncProto = indentFuncProto self.indentFuncPointer = indentFuncPointer self.alignFuncParam = alignFuncParam + self.expandEnumerants = expandEnumerants + # ObjectTrackerOutputGenerator - subclass of OutputGenerator. # Generates object_tracker layer object validation code @@ -396,9 +397,6 @@ class ObjectTrackerOutputGenerator(OutputGenerator): write('#ifdef', self.featureExtraProtect, file=self.outFile) # Write the object_tracker code to the file if (self.sections['command']): - if (self.genOpts.protectProto): - write(self.genOpts.protectProto, - self.genOpts.protectProtoStr, file=self.outFile) write('\n'.join(self.sections['command']), end=u'', file=self.outFile) if (self.featureExtraProtect != None): write('\n#endif //', self.featureExtraProtect, file=self.outFile) @@ -420,6 +418,7 @@ class ObjectTrackerOutputGenerator(OutputGenerator): # Start processing in superclass OutputGenerator.beginFeature(self, interface, emit) self.headerVersion = None + self.featureExtraProtect = GetFeatureProtect(interface) if self.featureName != 'VK_VERSION_1_0' and self.featureName != 'VK_VERSION_1_1': white_list_entry = [] |