OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Refuse to build lavapipe without llvmpipe

Browse Source 
This config doesn't work, and as of recently it no longer links.
Let's fail it early.

Fixes: 7b79db11c2 ("lavapipe: enable correct workgroup sizing")
Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10107>
This commit is contained in:
Jesse Natalie
2021-04-08 09:33:46 -07:00
committed by Marge Bot
parent 4251e9cddf
commit 3aa8cbc784
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@@ -1605,6 +1605,8 @@ if with_llvm
if draw_with_llvm if draw_with_llvm
pre_args += '-DDRAW_LLVM_AVAILABLE' pre_args += '-DDRAW_LLVM_AVAILABLE'
elif with_swrast_vk
error('Lavapipe requires LLVM draw support.')
elif with_gallium_swr elif with_gallium_swr
error('SWR requires LLVM draw support.') error('SWR requires LLVM draw support.')
endif endif
@@ -1634,8 +1636,8 @@ if with_llvm
cpp_args += '-fno-rtti' cpp_args += '-fno-rtti'
endif endif
endif endif
elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr or with_swrast_vk
error('The following drivers require LLVM: Radv, RadeonSI, SWR. One of these is enabled, but LLVM is disabled.') error('The following drivers require LLVM: Radv, RadeonSI, SWR, Lavapipe. One of these is enabled, but LLVM is disabled.')
elif with_gallium_opencl elif with_gallium_opencl
error('The OpenCL "Clover" state tracker requires LLVM, but LLVM is disabled.') error('The OpenCL "Clover" state tracker requires LLVM, but LLVM is disabled.')
elif with_microsoft_clc elif with_microsoft_clc