fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 13:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: Ensure that LLVMSPIRVLib is not required for Clover

Browse source 
Fixes: cb588d5d6e ("compiler/clc: Move related NIR passes to the common mesa clc")
Closes: #9391
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24244>
(cherry picked from commit 2f3230a736)
This commit is contained in:
Caio Oliveira 2023-07-19 14:57:03 -07:00 • committed by Dylan Baker
parent 9d1efae314
commit 20dbe71b13
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -24554,7 +24554,7 @@
"description": "meson: Ensure that LLVMSPIRVLib is not required for Clover", "description": "meson: Ensure that LLVMSPIRVLib is not required for Clover",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "cb588d5d6ee290ff8ea405ff3ee56a51bc1b2145", "because_sha": "cb588d5d6ee290ff8ea405ff3ee56a51bc1b2145",
"notes": null "notes": null

2
meson.build
View file

@ -1742,7 +1742,7 @@ else
draw_with_llvm = false draw_with_llvm = false
endif endif
with_opencl_spirv = (_opencl != 'disabled' and get_option('opencl-spirv')) or with_clc with_opencl_spirv = (_opencl != 'disabled' and get_option('opencl-spirv')) or with_intel_clc or with_microsoft_clc or with_gallium_rusticl
if with_opencl_spirv if with_opencl_spirv
chosen_llvm_version_array = dep_llvm.version().split('.') chosen_llvm_version_array = dep_llvm.version().split('.')
chosen_llvm_version_major = chosen_llvm_version_array[0].to_int() chosen_llvm_version_major = chosen_llvm_version_array[0].to_int()