Module: Mesa Branch: main Commit: c5438450adecab49f0c0798b353b81942b3b4a88 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c5438450adecab49f0c0798b353b81942b3b4a88
Author: Emma Anholt <[email protected]> Date: Tue May 4 13:38:49 2021 -0700 turnip: Switch to the shared vulkan ICD generator. One less python script to maintain. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10635> --- src/freedreno/vulkan/meson.build | 9 ++++---- src/freedreno/vulkan/tu_icd.py | 47 ---------------------------------------- 2 files changed, 5 insertions(+), 51 deletions(-) diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index 1f9bf57df03..a90f3da7d2c 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -168,14 +168,15 @@ endif freedreno_icd = custom_target( 'freedreno_icd', - input : 'tu_icd.py', + input : [vk_icd_gen, vk_api_xml], output : 'freedreno_icd.@[email protected]'.format(host_machine.cpu()), command : [ - prog_python, '@INPUT@', - '--lib-path', join_paths(get_option('prefix'), get_option('libdir')), + prog_python, '@INPUT0@', + '--api-version', '1.1', '--xml', '@INPUT1@', + '--lib-path', join_paths(get_option('prefix'), get_option('libdir'), + 'libvulkan_freedreno.so'), '--out', '@OUTPUT@', ], - depend_files : files('tu_extensions.py'), build_by_default : true, install_dir : with_vulkan_icd_dir, install : true, diff --git a/src/freedreno/vulkan/tu_icd.py b/src/freedreno/vulkan/tu_icd.py deleted file mode 100644 index 1947a969aff..00000000000 --- a/src/freedreno/vulkan/tu_icd.py +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2017 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sub license, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice (including the -# next paragraph) shall be included in all copies or substantial portions -# of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -# IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR -# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import json -import os.path - -from tu_extensions import * - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - parser.add_argument('--out', help='Output json file.', required=True) - parser.add_argument('--lib-path', help='Path to libvulkan_freedreno.so') - args = parser.parse_args() - - path = 'libvulkan_freedreno.so' - if args.lib_path: - path = os.path.join(args.lib_path, path) - - json_data = { - 'file_format_version': '1.0.0', - 'ICD': { - 'library_path': path, - 'api_version': str(MAX_API_VERSION), - }, - } - - with open(args.out, 'w') as f: - json.dump(json_data, f, indent = 4, sort_keys=True, separators=(',', ': ')) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
