From 2d6de5d2274e0e2ed6b233c7cee5ec97def7a5f7 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Sat, 30 Jan 2021 10:08:37 -0600
Subject: [PATCH] anv,vulkan: Move anv_icd.py to a common location
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8792>
---
 src/intel/vulkan/meson.build                               | 2 +-
 src/vulkan/util/meson.build                                | 1 +
 src/{intel/vulkan/anv_icd.py => vulkan/util/vk_icd_gen.py} | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename src/{intel/vulkan/anv_icd.py => vulkan/util/vk_icd_gen.py} (100%)

diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 6864380..d3d72d5 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -58,7 +58,7 @@ anv_extensions_h = custom_target(
 
 intel_icd = custom_target(
   'intel_icd',
-  input : ['anv_icd.py', vk_api_xml],
+  input : [vk_icd_gen, vk_api_xml],
   output : 'intel_icd.@0@.json'.format(host_machine.cpu()),
   command : [
     prog_python, '@INPUT0@',
diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
index 842c616..20cc605 100644
--- a/src/vulkan/util/meson.build
+++ b/src/vulkan/util/meson.build
@@ -20,6 +20,7 @@
 
 vk_entrypoints_gen = files('vk_entrypoints_gen.py')
 vk_extensions_gen = files('vk_extensions_gen.py')
+vk_icd_gen = files('vk_icd_gen.py')
 
 files_vulkan_util = files(
   'vk_alloc.h',
diff --git a/src/intel/vulkan/anv_icd.py b/src/vulkan/util/vk_icd_gen.py
similarity index 100%
rename from src/intel/vulkan/anv_icd.py
rename to src/vulkan/util/vk_icd_gen.py
-- 
2.7.4