diff options
| author | Eric Engestrom <eric@igalia.com> | 2025-09-17 17:08:19 +0200 |
|---|---|---|
| committer | Marge Bot <marge-bot@fdo.invalid> | 2025-09-18 19:07:10 +0000 |
| commit | bbb76517eea2bdc506df62d54c48b1e53277b8bf (patch) | |
| tree | 1fdeb9a36b268b372940a2d1852b09ebb38bdf5a /meson.build | |
| parent | de8c297e0b8bc9973b9740e684b232dca176c108 (diff) | |
meson: only require glslang >= 12.2 when anv/radv/turnip are built
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37444>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 2222f245a43..89ca6e20fa4 100644 --- a/meson.build +++ b/meson.build @@ -628,6 +628,7 @@ if with_gallium_d3d12 and not _with_gallium_d3d12_video.disabled() pre_args += '-DHAVE_GALLIUM_D3D12_VIDEO' endif +with_bvh = with_amd_vk or with_intel_vk or with_swrast_vk or with_freedreno_vk _glslang_preamble_version = '12.2' # GLSL has interesting version output and Meson doesn't parse it correctly as of @@ -635,7 +636,7 @@ _glslang_preamble_version = '12.2' 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 or with_freedreno_vk + required : with_vulkan_overlay_layer or with_aco_tests or with_bvh ) if prog_glslang.found() @@ -651,7 +652,7 @@ if prog_glslang.found() else glslang_depfile = [] endif - if _glslang_version.version_compare('< ' + _glslang_preamble_version) + if with_bvh and _glslang_version.version_compare('< ' + _glslang_preamble_version) error('glslang >= ' + _glslang_preamble_version + ' is required.') endif if run_command(prog_glslang, [ '--quiet', '--version' ], check : false).returncode() == 0 |