diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 6d63121e2cd..311cd8fc063 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -322,8 +322,6 @@ _dev_icd = custom_target( ) 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_radv_tests test( diff --git a/src/asahi/vulkan/meson.build b/src/asahi/vulkan/meson.build index a5e483cbcba..c501fc6ab1c 100644 --- a/src/asahi/vulkan/meson.build +++ b/src/asahi/vulkan/meson.build @@ -137,5 +137,3 @@ custom_target( ) 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) diff --git a/src/broadcom/vulkan/meson.build b/src/broadcom/vulkan/meson.build index d5cdbcd1ad5..66bf07cc63d 100644 --- a/src/broadcom/vulkan/meson.build +++ b/src/broadcom/vulkan/meson.build @@ -159,5 +159,3 @@ _dev_icd = custom_target( ) 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 603a841be50..b68006ae571 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -257,5 +257,3 @@ _dev_icd = custom_target( ) 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 d1d4e5ba2b3..41de1e5a0f1 100644 --- a/src/gallium/targets/lavapipe/meson.build +++ b/src/gallium/targets/lavapipe/meson.build @@ -60,5 +60,3 @@ _dev_icd = custom_target( ) 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/gfxstream/guest/vulkan/meson.build b/src/gfxstream/guest/vulkan/meson.build index e8cc28aff34..8a091b1e5f9 100644 --- a/src/gfxstream/guest/vulkan/meson.build +++ b/src/gfxstream/guest/vulkan/meson.build @@ -113,5 +113,3 @@ _dev_icd = custom_target( ) 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 1ff2f3ab4fd..356d59dc048 100644 --- a/src/imagination/vulkan/meson.build +++ b/src/imagination/vulkan/meson.build @@ -175,5 +175,3 @@ _dev_icd = custom_target( ) 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 2d1cc9fdacb..15d380d44cb 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -83,8 +83,6 @@ _dev_icd = custom_target( ) 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 = [] anv_per_hw_ver_files = files( diff --git a/src/intel/vulkan_hasvk/meson.build b/src/intel/vulkan_hasvk/meson.build index ea1763429cb..2e34cd66a7f 100644 --- a/src/intel/vulkan_hasvk/meson.build +++ b/src/intel/vulkan_hasvk/meson.build @@ -53,8 +53,6 @@ _dev_icd = custom_target( ) 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 = [] anv_per_hw_ver_files = files( diff --git a/src/kosmickrisp/vulkan/meson.build b/src/kosmickrisp/vulkan/meson.build index 8b7271424d1..41bf66d3eae 100644 --- a/src/kosmickrisp/vulkan/meson.build +++ b/src/kosmickrisp/vulkan/meson.build @@ -211,5 +211,3 @@ kosmickrisp_icd = custom_target( ) devenv.append('VK_DRIVER_FILES', kosmickrisp_icd.full_path()) -# Deprecated: replaced by VK_DRIVER_FILES above -devenv.append('VK_ICD_FILENAMES', kosmickrisp_icd.full_path()) diff --git a/src/microsoft/vulkan/meson.build b/src/microsoft/vulkan/meson.build index 99239a3e95b..b3136e927e2 100644 --- a/src/microsoft/vulkan/meson.build +++ b/src/microsoft/vulkan/meson.build @@ -120,5 +120,3 @@ _dev_icd = custom_target( ) 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 e7c81209ad1..e3fec2086c6 100644 --- a/src/nouveau/vulkan/meson.build +++ b/src/nouveau/vulkan/meson.build @@ -196,8 +196,6 @@ custom_target( ) 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 test( diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build index 11681bae638..fd3f6f4d6ba 100644 --- a/src/panfrost/vulkan/meson.build +++ b/src/panfrost/vulkan/meson.build @@ -271,5 +271,3 @@ _dev_icd = custom_target( ) 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 2ad2b6ff105..2d36b944445 100644 --- a/src/virtio/vulkan/meson.build +++ b/src/virtio/vulkan/meson.build @@ -52,8 +52,6 @@ _dev_icd = custom_target( ) 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( 'vn_acceleration_structure.c',