AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: do not reconstruct ICD paths

Browse Source 
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>
This commit is contained in:
Erik Faye-Lund
2023-01-25 16:55:32 +01:00
committed by Marge Bot
parent fd72369b65
commit b6a344f4ba
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/meson.build
+2 -2
View File
@@ -247,7 +247,7 @@ radeon_icd = custom_target(
)
_dev_icdname = 'radeon_devenv_icd.@0@.json'.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())
src/broadcom/vulkan/meson.build
+2 -2
View File
@@ -168,7 +168,7 @@ broadcom_icd = custom_target(
)
_dev_icdname = 'broadcom_devenv_icd.@0@.json'.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())
src/freedreno/vulkan/meson.build
+2 -2
View File
@@ -163,7 +163,7 @@ freedreno_icd = custom_target(
)
_dev_icdname = 'freedreno_devenv_icd.@0@.json'.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())
src/gallium/targets/lavapipe/meson.build
+2 -2
View File
@@ -42,7 +42,7 @@ lvp_icd = custom_target(
)
_dev_icdname = 'lvp_devenv_icd.@0@.json'.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())
src/imagination/vulkan/meson.build
+2 -2
View File
@@ -162,7 +162,7 @@ powervr_mesa_icd = custom_target(
)
_dev_icdname = 'powervr_mesa_devenv_icd.@0@.json'.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())
src/intel/vulkan/meson.build
+2 -2
View File
@@ -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(
src/intel/vulkan_hasvk/meson.build
+2 -2
View File
@@ -49,7 +49,7 @@ intel_hasvk_icd = custom_target(
)
_dev_icdname = 'intel_hasvk_devenv_icd.@0@.json'.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(
src/microsoft/vulkan/meson.build
+2 -2
View File
@@ -131,7 +131,7 @@ dzn_icd = custom_target(
)
_dev_icdname = 'dzn_devenv_icd.@0@.json'.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())
src/panfrost/vulkan/meson.build
+2 -2
View File
@@ -156,7 +156,7 @@ panfrost_icd = custom_target(
)
_dev_icdname = 'panfrost_devenv_icd.@0@.json'.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())
src/virtio/vulkan/meson.build
+2 -2
View File
@@ -31,7 +31,7 @@ virtio_icd = custom_target(
)
_dev_icdname = 'virtio_devenv_icd.@0@.json'.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',