diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/known_good.json | 4 | ||||
| -rw-r--r-- | scripts/kvt_genvk.py | 11 | ||||
| -rw-r--r-- | scripts/mock_icd_generator.py | 2 | ||||
| -rw-r--r-- | scripts/vulkan_tools_helper_file_generator.py | 2 | ||||
| -rw-r--r-- | scripts/vulkaninfo_generator.py | 2 |
5 files changed, 18 insertions, 3 deletions
diff --git a/scripts/known_good.json b/scripts/known_good.json index 0bc4d60e..1712b79f 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -6,7 +6,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "v1.2.141" + "commit" : "v1.2.145" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.141", + "commit" : "v1.2.145", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/scripts/kvt_genvk.py b/scripts/kvt_genvk.py index a79a6ec7..8cd3e1be 100644 --- a/scripts/kvt_genvk.py +++ b/scripts/kvt_genvk.py @@ -80,6 +80,9 @@ def makeGenOpts(args): # Output target directory directory = args.directory + # Path to generated files, particularly api.py + genpath = args.genpath + # Descriptive names for various regexp patterns used to select # versions and extensions allFeatures = allExtensions = '.*' @@ -133,6 +136,7 @@ def makeGenOpts(args): conventions=conventions, filename='vk_typemap_helper.h', directory=directory, + genpath=None, apiname='vulkan', profile=None, versions=featuresPat, @@ -158,6 +162,7 @@ def makeGenOpts(args): conventions=conventions, filename='mock_icd.h', directory=directory, + genpath=None, apiname='vulkan', profile=None, versions=featuresPat, @@ -183,6 +188,7 @@ def makeGenOpts(args): conventions=conventions, filename='mock_icd.cpp', directory=directory, + genpath=None, apiname='vulkan', profile=None, versions=featuresPat, @@ -208,6 +214,7 @@ def makeGenOpts(args): conventions=conventions, filename='vulkaninfo.hpp', directory=directory, + genpath=None, apiname='vulkan', profile=None, versions=featuresPat, @@ -309,7 +316,9 @@ if __name__ == '__main__': parser.add_argument('-time', action='store_true', help='Enable timing') parser.add_argument('-validate', action='store_true', - help='Enable group validation') + help='Enable XML group validation') + parser.add_argument('-genpath', action='store', default='gen', + help='Path to generated files') parser.add_argument('-o', action='store', dest='directory', default='.', help='Create target and related files in specified directory') diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py index 5e9d0cd8..d835a0aa 100644 --- a/scripts/mock_icd_generator.py +++ b/scripts/mock_icd_generator.py @@ -1034,6 +1034,7 @@ class MockICDGeneratorOptions(GeneratorOptions): conventions = None, filename = None, directory = '.', + genpath = None, apiname = None, profile = None, versions = '.*', @@ -1061,6 +1062,7 @@ class MockICDGeneratorOptions(GeneratorOptions): conventions = conventions, filename = filename, directory = directory, + genpath = genpath, apiname = apiname, profile = profile, versions = versions, diff --git a/scripts/vulkan_tools_helper_file_generator.py b/scripts/vulkan_tools_helper_file_generator.py index 8cb53434..02170273 100644 --- a/scripts/vulkan_tools_helper_file_generator.py +++ b/scripts/vulkan_tools_helper_file_generator.py @@ -34,6 +34,7 @@ class HelperFileOutputGeneratorOptions(GeneratorOptions): conventions = None, filename = None, directory = '.', + genpath = None, apiname = None, profile = None, versions = '.*', @@ -58,6 +59,7 @@ class HelperFileOutputGeneratorOptions(GeneratorOptions): conventions = conventions, filename = filename, directory = directory, + genpath = genpath, apiname = apiname, profile = profile, versions = versions, diff --git a/scripts/vulkaninfo_generator.py b/scripts/vulkaninfo_generator.py index 5553d26f..61e8651b 100644 --- a/scripts/vulkaninfo_generator.py +++ b/scripts/vulkaninfo_generator.py @@ -117,6 +117,7 @@ class VulkanInfoGeneratorOptions(GeneratorOptions): input=None, filename=None, directory='.', + genpath = None, apiname=None, profile=None, versions='.*', @@ -144,6 +145,7 @@ class VulkanInfoGeneratorOptions(GeneratorOptions): conventions = conventions, filename = filename, directory = directory, + genpath = genpath, apiname = apiname, profile = profile, versions = versions, |