Module: Mesa Branch: master Commit: 8331b7c8d51e577a8ca37a9532864d1b90c130b6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8331b7c8d51e577a8ca37a9532864d1b90c130b6
Author: Bas Nieuwenhuizen <[email protected]> Date: Sun Feb 7 15:25:14 2021 +0100 radv: Remove custom icd json generation. No Android.mk changes as the radv provided json file isn't used. Reviewed-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8900> --- src/amd/vulkan/meson.build | 10 +++++----- src/amd/vulkan/radv_icd.py | 48 ---------------------------------------------- 2 files changed, 5 insertions(+), 53 deletions(-) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 9012d860db3..54ff9965c71 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -216,16 +216,16 @@ endif radeon_icd = custom_target( 'radeon_icd', - input : 'radv_icd.py', + input : [vk_icd_gen, vk_api_xml], output : 'radeon_icd.@[email protected]'.format(host_machine.cpu()), command : [ - prog_python, '@INPUT@', - '--lib-path', icd_lib_path, - '--file-name', icd_file_name, + prog_python, '@INPUT0@', + '--api-version', '1.2', '--xml', '@INPUT1@', + '--lib-path', join_paths(icd_lib_path, icd_file_name), '--out', '@OUTPUT@', ], - depend_files : files('radv_extensions.py'), build_by_default : true, install_dir : with_vulkan_icd_dir, install : true, ) + diff --git a/src/amd/vulkan/radv_icd.py b/src/amd/vulkan/radv_icd.py deleted file mode 100644 index ab1162a5076..00000000000 --- a/src/amd/vulkan/radv_icd.py +++ /dev/null @@ -1,48 +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 radv_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 file') - parser.add_argument('--file-name', help='Name of file') - args = parser.parse_args() - - path = args.file_name - 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
