From fac818bdb339b3a1eb3ef43e915847c0e5ccb067 Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Sat, 4 Jan 2025 20:48:26 +0100 Subject: [PATCH] meson: Require glslangValidator when building lavapipe The tool is required by the runtime for acceleration structures. Lavapipe uses some of those runtime helpers and will use more of them in the future (https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31426), especially those that have a hard requirement for the tool. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12412 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12437 Reviewed-by: Dylan Baker Part-of: --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 7af6401add4..a5219fe1bf1 100644 --- a/meson.build +++ b/meson.build @@ -637,8 +637,12 @@ endif # GLSL has interesting version output and Meson doesn't parse it correctly as of # Meson 1.4.0 -prog_glslang = find_program('glslangValidator', native : true, - required : with_vulkan_overlay_layer or with_aco_tests or with_amd_vk or with_intel_vk) +prog_glslang = find_program( + 'glslangValidator', + native : true, + required : with_vulkan_overlay_layer or with_aco_tests or with_amd_vk or with_intel_vk or with_swrast_vk +) + if prog_glslang.found() # Check if glslang has depfile support. Support was added in 11.3.0, but # Windows path support was broken until 11.9.0.