mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-02-03 13:00:37 +01:00
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 37c7d19e46)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38803>
This commit is contained in:
parent
fb984d2845
commit
0648e0a222
2 changed files with 2 additions and 2 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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') \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue