From ff37f687408e6404a11160e93717e534384c7ef2 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 1 Apr 2024 13:30:18 +0100 Subject: [PATCH] meson: add VK_DRIVER_FILES to devenv, alongside the old VK_ICD_FILENAMES Part-of: --- src/amd/vulkan/meson.build | 2 ++ src/broadcom/vulkan/meson.build | 2 ++ src/freedreno/vulkan/meson.build | 2 ++ src/gallium/targets/lavapipe/meson.build | 2 ++ src/imagination/vulkan/meson.build | 2 ++ src/intel/vulkan/meson.build | 2 ++ src/intel/vulkan_hasvk/meson.build | 2 ++ src/microsoft/vulkan/meson.build | 2 ++ src/nouveau/vulkan/meson.build | 2 ++ src/panfrost/vulkan/meson.build | 2 ++ src/virtio/vulkan/meson.build | 2 ++ 11 files changed, 22 insertions(+) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 630914b8339..0dbbd07a782 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -289,6 +289,8 @@ _dev_icd = custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) +# Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path()) if with_tests diff --git a/src/broadcom/vulkan/meson.build b/src/broadcom/vulkan/meson.build index 4e6eb3990d5..3f04a4162dc 100644 --- a/src/broadcom/vulkan/meson.build +++ b/src/broadcom/vulkan/meson.build @@ -183,4 +183,6 @@ _dev_icd = custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) +# Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path()) diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index 572281f7291..64d52d7db71 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -228,4 +228,6 @@ _dev_icd = custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) +# Deprecated: replaced by VK_DRIVER_FILES above 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 253eb0996f5..9b009e6a7e1 100644 --- a/src/gallium/targets/lavapipe/meson.build +++ b/src/gallium/targets/lavapipe/meson.build @@ -56,4 +56,6 @@ _dev_icd = custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) +# Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path()) diff --git a/src/imagination/vulkan/meson.build b/src/imagination/vulkan/meson.build index 2f50b14fbb0..ff57298d016 100644 --- a/src/imagination/vulkan/meson.build +++ b/src/imagination/vulkan/meson.build @@ -186,4 +186,6 @@ _dev_icd = custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) +# Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path()) diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 0431c102925..8eecda92547 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -94,6 +94,8 @@ _dev_icd = custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) +# Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path()) libanv_per_hw_ver_libs = [] diff --git a/src/intel/vulkan_hasvk/meson.build b/src/intel/vulkan_hasvk/meson.build index 2404647001b..80e3cba2870 100644 --- a/src/intel/vulkan_hasvk/meson.build +++ b/src/intel/vulkan_hasvk/meson.build @@ -64,6 +64,8 @@ _dev_icd = custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) +# Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path()) libanv_per_hw_ver_libs = [] diff --git a/src/microsoft/vulkan/meson.build b/src/microsoft/vulkan/meson.build index adcd2ea1ebf..c8bf270ecc3 100644 --- a/src/microsoft/vulkan/meson.build +++ b/src/microsoft/vulkan/meson.build @@ -138,4 +138,6 @@ _dev_icd = custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) +# Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path()) diff --git a/src/nouveau/vulkan/meson.build b/src/nouveau/vulkan/meson.build index 91cd8f9a87d..b5312233b35 100644 --- a/src/nouveau/vulkan/meson.build +++ b/src/nouveau/vulkan/meson.build @@ -148,6 +148,8 @@ custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', meson.current_build_dir() / _dev_icdname) +# Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', meson.current_build_dir() / _dev_icdname) if with_tests and not with_platform_android diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build index 35701ae3346..22ff57fb2c0 100644 --- a/src/panfrost/vulkan/meson.build +++ b/src/panfrost/vulkan/meson.build @@ -171,4 +171,6 @@ _dev_icd = custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) +# Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path()) diff --git a/src/virtio/vulkan/meson.build b/src/virtio/vulkan/meson.build index c6c376b48fb..ed729105de4 100644 --- a/src/virtio/vulkan/meson.build +++ b/src/virtio/vulkan/meson.build @@ -46,6 +46,8 @@ _dev_icd = custom_target( build_by_default : true, ) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) +# Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path()) libvn_files = files(