From 0648e0a2227d339bdfd806544dade7bc4e8632ae Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 20 Nov 2025 22:38:58 +0100 Subject: [PATCH] meson: auto-disable `draw-use-llvm` when `llvm=disabled` The option's description is: > Whether to use LLVM for the Gallium draw module, if LLVM is included. Let's disable it right away if LLVM is disabled, to avoid some configurations from failing. Cc: mesa-stable (cherry picked from commit 37c7d19e46a4863c120186a99ac0344c2dd31260) Part-of: --- .pick_status.json | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4186ee9d319..95c458a63c0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3314,7 +3314,7 @@ "description": "meson: auto-disable `draw-use-llvm` when `llvm=disabled`", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/meson.build b/meson.build index 5088b15d232..f85cd266e8c 100644 --- a/meson.build +++ b/meson.build @@ -218,7 +218,7 @@ with_gallium_ethosu = gallium_drivers.contains('ethosu') foreach gallium_driver : gallium_drivers pre_args += '-DHAVE_@0@'.format(gallium_driver.to_upper()) endforeach -draw_with_llvm = get_option('draw-use-llvm') +draw_with_llvm = with_llvm.allowed() and get_option('draw-use-llvm') with_llvm = with_llvm \ .enable_if(with_gallium_i915, error_message : 'i915 Gallium driver requires LLVM for vertex shaders') \ .enable_if(with_gallium_llvmpipe, error_message : 'LLVMPipe Gallium driver requires LLVM') \