From 4eada332235c5afaace7c42c30ee42e0234fd49e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 16 Feb 2021 13:56:54 +1000 Subject: [PATCH] lavapipe: use the common icd generator Acked-by: Jesse Natalie Part-of: --- src/gallium/targets/lavapipe/lvp_icd.py | 48 ------------------------ src/gallium/targets/lavapipe/meson.build | 10 ++--- 2 files changed, 5 insertions(+), 53 deletions(-) delete mode 100644 src/gallium/targets/lavapipe/lvp_icd.py diff --git a/src/gallium/targets/lavapipe/lvp_icd.py b/src/gallium/targets/lavapipe/lvp_icd.py deleted file mode 100644 index f7d85cb97b8..00000000000 --- a/src/gallium/targets/lavapipe/lvp_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 - -import argparse - -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_lvp.*') - parser.add_argument('--suffix', help='Extension of libvulkan_lvp.*') - args = parser.parse_args() - - path = 'libvulkan_lvp.' + args.suffix - 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('1.1.107'), - }, - } - - with open(args.out, 'w') as f: - json.dump(json_data, f, indent = 4, sort_keys=True, separators=(',', ': ')) diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build index 8a0c9554c0f..d64f7606412 100644 --- a/src/gallium/targets/lavapipe/meson.build +++ b/src/gallium/targets/lavapipe/meson.build @@ -18,15 +18,15 @@ endif lvp_icd = custom_target( 'lvp_icd', - input : 'lvp_icd.py', + input : [vk_icd_gen, vk_api_xml], output : 'lvp_icd.@0@.json'.format(host_machine.cpu()), command : [ - prog_python, '@INPUT@', - '--lib-path', module_dir, + prog_python, '@INPUT0@', + '--api-version', '1.1', '--xml', '@INPUT1@', + '--lib-path', join_paths(get_option('prefix'), get_option('libdir'), + 'libvulkan_lvp.so'), '--out', '@OUTPUT@', - '--suffix', libvulkan_lvp.full_path().split('.')[-1], ], - depend_files : files('../../frontends/lavapipe/lvp_extensions.py'), build_by_default : true, install_dir : with_vulkan_icd_dir, install : true,