Mesa (master): v3dv: remove custom icd json generation

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 8d72992ed5c0ff28c1731ec2aea9a0bf9f274b2f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d72992ed5c0ff28c1731ec2aea9a0bf9f274b2f

Author: Alejandro Piñeiro <apinheiro at igalia.com>
Date:   Tue Apr 27 13:09:46 2021 +0200

v3dv: remove custom icd json generation

Most of the stuff needed was moved to vk util. So one less python
generator to maintain.

anv and radv already migrated.

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10484>

---

 src/broadcom/vulkan/meson.build |  9 ++++----
 src/broadcom/vulkan/v3dv_icd.py | 48 -----------------------------------------
 2 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/src/broadcom/vulkan/meson.build b/src/broadcom/vulkan/meson.build
index 88bee8c1380..33942ab38ef 100644
--- a/src/broadcom/vulkan/meson.build
+++ b/src/broadcom/vulkan/meson.build
@@ -150,14 +150,15 @@ endif
 
 broadcom_icd = custom_target(
   'broadcom_icd',
-  input : 'v3dv_icd.py',
+  input : [vk_icd_gen, vk_api_xml],
   output : 'broadcom_icd. at 0@.json'.format(host_machine.cpu()),
   command : [
-    prog_python, '@INPUT@',
-    '--lib-path', join_paths(get_option('prefix'), get_option('libdir')),
+    prog_python, '@INPUT0@',
+    '--api-version', '1.0', '--xml', '@INPUT1@',
+    '--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
+    		  	     'libvulkan_broadcom.so'),
     '--out', '@OUTPUT@',
   ],
-  depend_files : files('v3dv_extensions.py'),
   build_by_default : true,
   install_dir : with_vulkan_icd_dir,
   install : true,
diff --git a/src/broadcom/vulkan/v3dv_icd.py b/src/broadcom/vulkan/v3dv_icd.py
deleted file mode 100644
index a876f010d1f..00000000000
--- a/src/broadcom/vulkan/v3dv_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
-
-from v3dv_extensions import MAX_API_VERSION
-
-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_broadcom.so')
-    args = parser.parse_args()
-
-    path = 'libvulkan_broadcom.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=(',', ': '))