scripts: Update generators for 1.1
diff --git a/scripts/unique_objects_generator.py b/scripts/unique_objects_generator.py
index 4d50994..c80696a 100644
--- a/scripts/unique_objects_generator.py
+++ b/scripts/unique_objects_generator.py
@@ -24,6 +24,7 @@
import xml.etree.ElementTree as etree
from generator import *
from collections import namedtuple
+from common_codegen import *
# UniqueObjectsGeneratorOptions - subclass of GeneratorOptions.
#
@@ -69,34 +70,34 @@
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.alignFuncParam = alignFuncParam
+ self.expandEnumerants = expandEnumerants
+
# UniqueObjectsOutputGenerator - subclass of OutputGenerator.
# Generates unique objects layer non-dispatchable handle-wrapping code.
@@ -237,9 +238,6 @@
write('#ifdef', self.featureExtraProtect, file=self.outFile)
# Write the unique_objects 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)
@@ -260,7 +258,7 @@
# 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 = []
if (self.featureExtraProtect != None):