diff options
| author | 2019-10-16 18:59:41 -0700 | |
|---|---|---|
| committer | 2019-10-16 19:06:58 -0700 | |
| commit | aeaa867b6079f5593e9d94b9bd23eb400320adc0 (patch) | |
| tree | 8195b1dfa808dfa09a022ca75a721cfc629203a3 | |
| parent | 5365a7b7812bd58df78a0d37f6b99e3fc976bad2 (diff) | |
Vulkan: factor base extension name into a function -- continue
Bug: 134185757
Test: ./scripts/code_generator.py && build
Change-Id: I5d1e604a4c70e009605cb6f5a28d4214be796dda
| -rw-r--r-- | vulkan/scripts/driver_generator.py | 8 | ||||
| -rw-r--r-- | vulkan/scripts/generator_common.py | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/vulkan/scripts/driver_generator.py b/vulkan/scripts/driver_generator.py index 0be049186e..0f3d760d5f 100644 --- a/vulkan/scripts/driver_generator.py +++ b/vulkan/scripts/driver_generator.py @@ -272,7 +272,7 @@ def _define_proc_hook_stub(cmd, f): if _need_proc_hook_stub(cmd): return_type = gencom.return_type_dict[cmd] ext_name = gencom.extension_dict[cmd] - ext_hook = 'ProcHook::' + ext_name[3:] + ext_hook = 'ProcHook::' + gencom.base_ext_name(ext_name) handle = gencom.param_dict[cmd][0][1] param_types = ', '.join([''.join(i) for i in gencom.param_dict[cmd]]) param_names = ', '.join([''.join(i[1]) for i in gencom.param_dict[cmd]]) @@ -327,7 +327,8 @@ def _define_instance_proc_hook(cmd, f): if cmd in gencom.extension_dict: ext_name = gencom.extension_dict[cmd] - f.write(gencom.indent(2) + 'ProcHook::' + ext_name[3:] + ',\n') + f.write(gencom.indent(2) + 'ProcHook::' + + gencom.base_ext_name(ext_name) + ',\n') if gencom.is_extension_internal(ext_name): f.write("""\ @@ -359,7 +360,8 @@ def _define_device_proc_hook(cmd, f): if cmd in gencom.extension_dict: ext_name = gencom.extension_dict[cmd] - f.write(gencom.indent(2) + 'ProcHook::' + ext_name[3:] + ',\n') + f.write(gencom.indent(2) + 'ProcHook::' + + gencom.base_ext_name(ext_name) + ',\n') if gencom.is_extension_internal(ext_name): f.write("""\ diff --git a/vulkan/scripts/generator_common.py b/vulkan/scripts/generator_common.py index 5bfa9ecb52..670ba66d1b 100644 --- a/vulkan/scripts/generator_common.py +++ b/vulkan/scripts/generator_common.py @@ -286,7 +286,7 @@ def init_proc(name, f): """ f.write(indent(1)) if name in extension_dict: - f.write('INIT_PROC_EXT(' + extension_dict[name][3:] + ', ') + f.write('INIT_PROC_EXT(' + base_ext_name(extension_dict[name]) + ', ') else: f.write('INIT_PROC(') |