scripts: Update generators for 1.1
diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py
index b1d5e58..ccbaf15 100644
--- a/scripts/mock_icd_generator.py
+++ b/scripts/mock_icd_generator.py
@@ -26,6 +26,8 @@
import os,re,sys
from generator import *
+from common_codegen import *
+
# Mock header code
HEADER_C_CODE = '''
@@ -349,21 +351,21 @@
}
#endif /* VK_USE_PLATFORM_WIN32_KHR */
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceGroupSurfacePresentModesKHX(
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceGroupSurfacePresentModesKHR(
VkDevice device,
VkSurfaceKHR surface,
- VkDeviceGroupPresentModeFlagsKHX* pModes)
+ VkDeviceGroupPresentModeFlagsKHR* pModes)
{
- return vkmock::GetDeviceGroupSurfacePresentModesKHX(device, surface, pModes);
+ return vkmock::GetDeviceGroupSurfacePresentModesKHR(device, surface, pModes);
}
-EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDevicePresentRectanglesKHX(
+EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDevicePresentRectanglesKHR(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
uint32_t* pRectCount,
VkRect2D* pRects)
{
- return vkmock::GetPhysicalDevicePresentRectanglesKHX(physicalDevice, surface, pRectCount, pRects);
+ return vkmock::GetPhysicalDevicePresentRectanglesKHR(physicalDevice, surface, pRectCount, pRects);
}
#ifdef VK_USE_PLATFORM_VI_NN
@@ -713,6 +715,7 @@
defaultExtensions = None,
addExtensions = None,
removeExtensions = None,
+ emitExtensions = None,
sortProcedure = regSortFeatures,
prefixText = "",
genFuncPointers = True,
@@ -726,10 +729,11 @@
indentFuncProto = True,
indentFuncPointer = False,
alignFuncParam = 0,
+ 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
@@ -842,7 +846,7 @@
# Ignore extensions that ICDs should not implement or are not safe to report
ignore_exts = ['VK_EXT_validation_cache', 'VK_KHR_push_descriptor']
for ext in self.registry.tree.findall("extensions/extension"):
- if '0' != ext[0][0].attrib['value']: # Only include implemented extensions
+ if ext.attrib['supported'] != 'disabled': # Only include enabled extensions
if (ext.attrib['name'] in ignore_exts):
pass
elif (ext.attrib.get('type') and 'instance' == ext.attrib['type']):
@@ -884,6 +888,7 @@
#write('// starting beginFeature', file=self.outFile)
# Start processing in superclass
OutputGenerator.beginFeature(self, interface, emit)
+ self.featureExtraProtect = GetFeatureProtect(interface)
# C-specific
# Accumulate includes, defines, types, enums, function pointer typedefs,
# end function prototypes separately for this feature. They're only