scripts: Update generators for 1.1
diff --git a/scripts/helper_file_generator.py b/scripts/helper_file_generator.py
index 6f2ea4b..c3b0085 100644
--- a/scripts/helper_file_generator.py
+++ b/scripts/helper_file_generator.py
@@ -24,6 +24,7 @@
import xml.etree.ElementTree as etree
from generator import *
from collections import namedtuple
+from common_codegen import *
#
# HelperFileOutputGeneratorOptions - subclass of GeneratorOptions.
@@ -38,28 +39,26 @@
defaultExtensions = None,
addExtensions = None,
removeExtensions = None,
+ emitExtensions = None,
sortProcedure = regSortFeatures,
prefixText = "",
genFuncPointers = True,
protectFile = True,
protectFeature = True,
- protectProto = None,
- protectProtoStr = None,
apicall = '',
apientry = '',
apientryp = '',
alignFuncParam = 0,
library_name = '',
+ expandEnumerants = True,
helper_file_type = ''):
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
@@ -159,6 +158,8 @@
def beginFeature(self, interface, emit):
# Start processing in superclass
OutputGenerator.beginFeature(self, interface, emit)
+ self.featureExtraProtect = GetFeatureProtect(interface)
+
if self.featureName == 'VK_VERSION_1_0' or self.featureName == 'VK_VERSION_1_1':
return
nameElem = interface[0][1]