Module: Mesa Branch: main Commit: b6a344f4baa1ee2c784ca74499dc9fe3b4519013 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6a344f4baa1ee2c784ca74499dc9fe3b4519013
Author: Erik Faye-Lund <[email protected]> Date: Wed Jan 25 16:55:32 2023 +0100 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 <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20907> --- src/amd/vulkan/meson.build | 4 ++-- src/broadcom/vulkan/meson.build | 4 ++-- src/freedreno/vulkan/meson.build | 4 ++-- src/gallium/targets/lavapipe/meson.build | 4 ++-- src/imagination/vulkan/meson.build | 4 ++-- src/intel/vulkan/meson.build | 4 ++-- src/intel/vulkan_hasvk/meson.build | 4 ++-- src/microsoft/vulkan/meson.build | 4 ++-- src/panfrost/vulkan/meson.build | 4 ++-- src/virtio/vulkan/meson.build | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index fee1cc5c40d..4e12432759b 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -247,7 +247,7 @@ radeon_icd = custom_target( ) _dev_icdname = 'radeon_devenv_icd.@[email protected]'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( 'radeon_devenv_icd', input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, @@ -260,4 +260,4 @@ 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()) diff --git a/src/broadcom/vulkan/meson.build b/src/broadcom/vulkan/meson.build index e2c19816a17..dd84c65e9da 100644 --- a/src/broadcom/vulkan/meson.build +++ b/src/broadcom/vulkan/meson.build @@ -168,7 +168,7 @@ broadcom_icd = custom_target( ) _dev_icdname = 'broadcom_devenv_icd.@[email protected]'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( 'broadcom_devenv_icd', input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, @@ -181,4 +181,4 @@ 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()) diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index ee265aa9860..421c2ffca49 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -163,7 +163,7 @@ freedreno_icd = custom_target( ) _dev_icdname = 'freedreno_devenv_icd.@[email protected]'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( 'freedreno_devenv_icd', input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, @@ -176,4 +176,4 @@ 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()) diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build index c69c8fbe161..369aad5455d 100644 --- a/src/gallium/targets/lavapipe/meson.build +++ b/src/gallium/targets/lavapipe/meson.build @@ -42,7 +42,7 @@ lvp_icd = custom_target( ) _dev_icdname = 'lvp_devenv_icd.@[email protected]'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( 'lvp_devenv_icd', input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, @@ -55,4 +55,4 @@ 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()) diff --git a/src/imagination/vulkan/meson.build b/src/imagination/vulkan/meson.build index 6c05eddb454..e69e844a091 100644 --- a/src/imagination/vulkan/meson.build +++ b/src/imagination/vulkan/meson.build @@ -162,7 +162,7 @@ powervr_mesa_icd = custom_target( ) _dev_icdname = 'powervr_mesa_devenv_icd.@[email protected]'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( 'powervr_mesa_devenv_icd', input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, @@ -175,4 +175,4 @@ 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()) 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.@[email protected]'.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( diff --git a/src/intel/vulkan_hasvk/meson.build b/src/intel/vulkan_hasvk/meson.build index 10197493469..0d53080a2f0 100644 --- a/src/intel/vulkan_hasvk/meson.build +++ b/src/intel/vulkan_hasvk/meson.build @@ -49,7 +49,7 @@ intel_hasvk_icd = custom_target( ) _dev_icdname = 'intel_hasvk_devenv_icd.@[email protected]'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( 'intel_hasvk_devenv_icd', input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, @@ -62,7 +62,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( diff --git a/src/microsoft/vulkan/meson.build b/src/microsoft/vulkan/meson.build index 39c6faf70de..9b4d601bfe8 100644 --- a/src/microsoft/vulkan/meson.build +++ b/src/microsoft/vulkan/meson.build @@ -131,7 +131,7 @@ dzn_icd = custom_target( ) _dev_icdname = 'dzn_devenv_icd.@[email protected]'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( 'dzn_devenv_icd', input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, @@ -139,4 +139,4 @@ 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()) diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build index c09560be5d5..8d7cc5e2b11 100644 --- a/src/panfrost/vulkan/meson.build +++ b/src/panfrost/vulkan/meson.build @@ -156,7 +156,7 @@ panfrost_icd = custom_target( ) _dev_icdname = 'panfrost_devenv_icd.@[email protected]'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( 'panfrost_devenv_icd', input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, @@ -169,4 +169,4 @@ 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()) diff --git a/src/virtio/vulkan/meson.build b/src/virtio/vulkan/meson.build index a4c59ae8df5..3f9456a146b 100644 --- a/src/virtio/vulkan/meson.build +++ b/src/virtio/vulkan/meson.build @@ -31,7 +31,7 @@ virtio_icd = custom_target( ) _dev_icdname = 'virtio_devenv_icd.@[email protected]'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( 'virtio_devenv_icd', input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, @@ -44,7 +44,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()) libvn_files = files( 'vn_buffer.c',
