diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/common_codegen.py | 1 | ||||
| -rw-r--r-- | scripts/known_good.json | 6 | ||||
| -rw-r--r-- | scripts/kvt_genvk.py | 7 | ||||
| -rw-r--r-- | scripts/mock_icd_generator.py | 3 | ||||
| -rw-r--r-- | scripts/vulkan_tools_helper_file_generator.py | 3 |
5 files changed, 15 insertions, 5 deletions
diff --git a/scripts/common_codegen.py b/scripts/common_codegen.py index 47bb6329..89545326 100644 --- a/scripts/common_codegen.py +++ b/scripts/common_codegen.py @@ -50,6 +50,7 @@ prefixStrings = [ platform_dict = { 'android' : 'VK_USE_PLATFORM_ANDROID_KHR', 'fuchsia' : 'VK_USE_PLATFORM_FUCHSIA', + 'ggp': 'VK_USE_PLATFORM_GGP', 'ios' : 'VK_USE_PLATFORM_IOS_MVK', 'macos' : 'VK_USE_PLATFORM_MACOS_MVK', 'metal' : 'VK_USE_PLATFORM_METAL_EXT', diff --git a/scripts/known_good.json b/scripts/known_good.json index 0bb22877..7aa09d2d 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -6,7 +6,7 @@ "sub_dir" : "glslang", "build_dir" : "glslang/build", "install_dir" : "glslang/build/install", - "commit" : "5432f0dd8f331f15182681664d7486681e8514e6", + "commit" : "e06c7e9a515b716c731bda13f507546f107775d1", "prebuild" : [ "python update_glslang_sources.py" ] @@ -17,7 +17,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "v1.1.102" + "commit" : "v1.1.106" }, { "name" : "MoltenVK", @@ -41,7 +41,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.1.102", + "commit" : "v1.1.106", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/scripts/kvt_genvk.py b/scripts/kvt_genvk.py index 399c35ba..e7404aa1 100644 --- a/scripts/kvt_genvk.py +++ b/scripts/kvt_genvk.py @@ -112,10 +112,14 @@ def makeGenOpts(args): # Defaults for generating re-inclusion protection wrappers (or not) protectFeature = protect + # An API style convention object + conventions = VulkanConventions() + # Helper file generator options for typemap_helper.h genOpts['vk_typemap_helper.h'] = [ HelperFileOutputGenerator, HelperFileOutputGeneratorOptions( + conventions = conventions, filename = 'vk_typemap_helper.h', directory = directory, apiname = 'vulkan', @@ -140,6 +144,7 @@ def makeGenOpts(args): genOpts['mock_icd.h'] = [ MockICDOutputGenerator, MockICDGeneratorOptions( + conventions = conventions, filename = 'mock_icd.h', directory = directory, apiname = 'vulkan', @@ -164,6 +169,7 @@ def makeGenOpts(args): genOpts['mock_icd.cpp'] = [ MockICDOutputGenerator, MockICDGeneratorOptions( + conventions = conventions, filename = 'mock_icd.cpp', directory = directory, apiname = 'vulkan', @@ -296,6 +302,7 @@ if __name__ == '__main__': # Generator Modifications from mock_icd_generator import MockICDGeneratorOptions, MockICDOutputGenerator from vulkan_tools_helper_file_generator import HelperFileOutputGenerator, HelperFileOutputGeneratorOptions + from vkconventions import VulkanConventions # This splits arguments which are space-separated lists args.feature = [name for arg in args.feature for name in arg.split()] diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py index 4cbd8313..48d9465f 100644 --- a/scripts/mock_icd_generator.py +++ b/scripts/mock_icd_generator.py @@ -934,6 +934,7 @@ CUSTOM_C_INTERCEPTS = { # separate line, align parameter names at the specified column class MockICDGeneratorOptions(GeneratorOptions): def __init__(self, + conventions = None, filename = None, directory = '.', apiname = None, @@ -959,7 +960,7 @@ class MockICDGeneratorOptions(GeneratorOptions): alignFuncParam = 0, expandEnumerants = True, helper_file_type = ''): - GeneratorOptions.__init__(self, filename, directory, apiname, profile, + GeneratorOptions.__init__(self, conventions, filename, directory, apiname, profile, versions, emitversions, defaultExtensions, addExtensions, removeExtensions, emitExtensions, sortProcedure) self.prefixText = prefixText diff --git a/scripts/vulkan_tools_helper_file_generator.py b/scripts/vulkan_tools_helper_file_generator.py index e6e690fe..ca5b2405 100644 --- a/scripts/vulkan_tools_helper_file_generator.py +++ b/scripts/vulkan_tools_helper_file_generator.py @@ -31,6 +31,7 @@ from common_codegen import * # HelperFileOutputGeneratorOptions - subclass of GeneratorOptions. class HelperFileOutputGeneratorOptions(GeneratorOptions): def __init__(self, + conventions = None, filename = None, directory = '.', apiname = None, @@ -53,7 +54,7 @@ class HelperFileOutputGeneratorOptions(GeneratorOptions): library_name = '', expandEnumerants = True, helper_file_type = ''): - GeneratorOptions.__init__(self, filename, directory, apiname, profile, + GeneratorOptions.__init__(self, conventions, filename, directory, apiname, profile, versions, emitversions, defaultExtensions, addExtensions, removeExtensions, emitExtensions, sortProcedure) self.prefixText = prefixText |