fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: do not reconstruct ICD paths
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
This is a follow up of
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20907/diffs?commit_id=b6a344f4baa1ee2c784ca74499dc9fe3b4519013

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38637>
This commit is contained in:
Yonggang Luo 2025-11-21 17:48:00 +08:00 • committed by Marge Bot
parent be4ad5c819
commit 095c2acf01
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/asahi/vulkan/meson.build
View file

@ -122,7 +122,7 @@ asahi_icd = custom_target(
) )
_dev_icdname = 'asahi_devenv_icd.@0@.json'.format(host_machine.cpu()) _dev_icdname = 'asahi_devenv_icd.@0@.json'.format(host_machine.cpu())
custom_target( _dev_icd = custom_target(
input : [vk_icd_gen, vk_api_xml], input : [vk_icd_gen, vk_api_xml],
output : _dev_icdname, output : _dev_icdname,
command : [ command : [
@ -136,4 +136,4 @@ custom_target(
build_by_default : true, build_by_default : true,
) )
devenv.append('VK_DRIVER_FILES', meson.current_build_dir() / _dev_icdname) devenv.append('VK_DRIVER_FILES', _dev_icd.full_path())

4
src/nouveau/vulkan/meson.build
View file

@ -180,7 +180,7 @@ nouveau_icd = custom_target(
) )
_dev_icdname = 'nouveau_devenv_icd.@0@.json'.format(host_machine.cpu()) _dev_icdname = 'nouveau_devenv_icd.@0@.json'.format(host_machine.cpu())
custom_target( _dev_icd = custom_target(
'nouveau_devenv_icd', 'nouveau_devenv_icd',
input : [vk_icd_gen, vk_api_xml], input : [vk_icd_gen, vk_api_xml],
output : _dev_icdname, output : _dev_icdname,
@ -195,7 +195,7 @@ custom_target(
build_by_default : true, build_by_default : true,
) )
devenv.append('VK_DRIVER_FILES', meson.current_build_dir() / _dev_icdname) devenv.append('VK_DRIVER_FILES', _dev_icd.full_path())
if with_tests and not with_platform_android if with_tests and not with_platform_android
test( test(