diff options
| author | Shannon McPherson <shannon@lunarg.com> | 2020-06-19 16:27:10 -0600 |
|---|---|---|
| committer | Shannon McPherson <shannon@lunarg.com> | 2020-06-22 14:56:08 -0600 |
| commit | 0f4d5f74f199b06bffc06cd2beed6ef07246fb0f (patch) | |
| tree | 6664a5d43975738cf8320da67ee9604d0a72f99f /scripts | |
| parent | 0a46a92e57976c51c82c597c21b0d283040348bf (diff) | |
| download | usermoji-0f4d5f74f199b06bffc06cd2beed6ef07246fb0f.tar.xz | |
scripts: Use named params for generator options
When calling in the vulkan header python generator the options have
changed in 1.2.142 which causes the options passed by the tools to be
off by one. This ends up setting the emitExtensions to the value of the
sortProcedure and eventually causes the script to fail.
This CL updates the tools to used named parameters for the generator so
that the addition of the genpath does not throw off the parameter
positioning.
Change-Id: I580d5f07ec3ff9e523dbf738561c2e53cfd42796
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mock_icd_generator.py | 16 | ||||
| -rw-r--r-- | scripts/vulkan_tools_helper_file_generator.py | 16 | ||||
| -rw-r--r-- | scripts/vulkaninfo_generator.py | 16 |
3 files changed, 39 insertions, 9 deletions
diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py index 3410af38..5e9d0cd8 100644 --- a/scripts/mock_icd_generator.py +++ b/scripts/mock_icd_generator.py @@ -1057,9 +1057,19 @@ class MockICDGeneratorOptions(GeneratorOptions): alignFuncParam = 0, expandEnumerants = True, helper_file_type = ''): - GeneratorOptions.__init__(self, conventions, filename, directory, apiname, profile, - versions, emitversions, defaultExtensions, - addExtensions, removeExtensions, emitExtensions, sortProcedure) + GeneratorOptions.__init__(self, + conventions = conventions, + filename = filename, + directory = directory, + apiname = apiname, + profile = profile, + versions = versions, + emitversions = emitversions, + defaultExtensions = defaultExtensions, + addExtensions = addExtensions, + removeExtensions = removeExtensions, + emitExtensions = emitExtensions, + sortProcedure = sortProcedure) self.prefixText = prefixText self.genFuncPointers = genFuncPointers self.protectFile = protectFile diff --git a/scripts/vulkan_tools_helper_file_generator.py b/scripts/vulkan_tools_helper_file_generator.py index 0b0153f7..8cb53434 100644 --- a/scripts/vulkan_tools_helper_file_generator.py +++ b/scripts/vulkan_tools_helper_file_generator.py @@ -54,9 +54,19 @@ class HelperFileOutputGeneratorOptions(GeneratorOptions): library_name = '', expandEnumerants = True, helper_file_type = ''): - GeneratorOptions.__init__(self, conventions, filename, directory, apiname, profile, - versions, emitversions, defaultExtensions, - addExtensions, removeExtensions, emitExtensions, sortProcedure) + GeneratorOptions.__init__(self, + conventions = conventions, + filename = filename, + directory = directory, + apiname = apiname, + profile = profile, + versions = versions, + emitversions = emitversions, + defaultExtensions = defaultExtensions, + addExtensions = addExtensions, + removeExtensions = removeExtensions, + emitExtensions = emitExtensions, + sortProcedure = sortProcedure) self.prefixText = prefixText self.genFuncPointers = genFuncPointers self.protectFile = protectFile diff --git a/scripts/vulkaninfo_generator.py b/scripts/vulkaninfo_generator.py index e1e80a60..5553d26f 100644 --- a/scripts/vulkaninfo_generator.py +++ b/scripts/vulkaninfo_generator.py @@ -140,9 +140,19 @@ class VulkanInfoGeneratorOptions(GeneratorOptions): alignFuncParam=0, expandEnumerants=True, ): - GeneratorOptions.__init__(self, conventions, filename, directory, apiname, profile, - versions, emitversions, defaultExtensions, - addExtensions, removeExtensions, emitExtensions, sortProcedure) + GeneratorOptions.__init__(self, + conventions = conventions, + filename = filename, + directory = directory, + apiname = apiname, + profile = profile, + versions = versions, + emitversions = emitversions, + defaultExtensions = defaultExtensions, + addExtensions = addExtensions, + removeExtensions = removeExtensions, + emitExtensions = emitExtensions, + sortProcedure = sortProcedure) self.input = input self.prefixText = prefixText self.genFuncPointers = genFuncPointers |