summaryrefslogtreecommitdiff
path: root/src/intel/vulkan
diff options
context:
space:
mode:
authorErik Faye-Lund <erik.faye-lund@collabora.com>2023-01-25 16:55:32 +0100
committerMarge Bot <emma+marge@anholt.net>2023-01-27 11:35:50 +0000
commitb6a344f4baa1ee2c784ca74499dc9fe3b4519013 (patch)
treec2533a7790bace34a4ffe779ebe406f08f9653d2 /src/intel/vulkan
parentfd72369b65649ee7f6605b3ec3d113c083352a93 (diff)
meson: do not reconstruct ICD paths
Meson will already construct these paths for us, so let's reuse them instead of throwing away the result and recontstructing them. Reviewed-by: Eric Engestrom <eric@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20907>
Diffstat (limited to 'src/intel/vulkan')
-rw-r--r--src/intel/vulkan/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 380552791b2..87ac4a534bd 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -78,7 +78,7 @@ intel_icd = custom_target(
)
_dev_icdname = 'intel_devenv_icd.@0@.json'.format(host_machine.cpu())
-custom_target(
+_dev_icd = custom_target(
'intel_devenv_icd',
input : [vk_icd_gen, vk_api_xml],
output : _dev_icdname,
@@ -91,7 +91,7 @@ custom_target(
build_by_default : true,
)
-devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname)
+devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path())
libanv_per_hw_ver_libs = []
anv_per_hw_ver_files = files(