Revert "meson/vulkan/util: allow venus to drop compiler deps"

This reverts commit 3923d43908.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@google.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26574>
This commit is contained in:
Yonggang Luo
2024-02-05 06:13:19 +08:00
committed by Marge Bot
parent 12c71ef847
commit a367cd4931
5 changed files with 6 additions and 44 deletions

View File

@@ -260,20 +260,6 @@ if with_any_vk and host_machine.system() == 'windows' and meson.version().versio
error('Vulkan drivers on Windows require meson 1.3 or newer')
endif
with_vk_compiler = [
with_intel_vk,
with_intel_hasvk,
with_amd_vk,
with_freedreno_vk,
with_panfrost_vk,
with_swrast_vk,
with_broadcom_vk,
with_imagination_vk,
with_microsoft_vk,
with_nouveau_vk,
].contains(true)
pre_args += '-DUSE_VK_COMPILER=@0@'.format(with_vk_compiler ? '1' : '0')
freedreno_kmds = get_option('freedreno-kmds')
if freedreno_kmds.length() != 0 and freedreno_kmds != [ 'msm' ] and with_freedreno_vk
if freedreno_kmds.contains('msm')