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

meson: Allow building lavapipe without specifying llvmpipe

Browse Source 
Avoids compiling glsl/opengl/... support when testing only lavapipe.

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30423>
This commit is contained in:
Konstantin
2024-07-30 12:58:14 +02:00
committed by Konstantin Seurer
parent 0fc3c52e43
commit 893c93a27a
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meson.build
View File

@@ -263,6 +263,7 @@ if with_any_vk and host_machine.system() == 'windows' and meson.version().versio
endif endif
with_any_llvmpipe = with_gallium_llvmpipe or with_swrast_vk with_any_llvmpipe = with_gallium_llvmpipe or with_swrast_vk
with_gallium_or_lvp = with_gallium or with_swrast_vk
freedreno_kmds = get_option('freedreno-kmds') freedreno_kmds = get_option('freedreno-kmds')
if freedreno_kmds.length() != 0 and freedreno_kmds != [ 'msm' ] and with_freedreno_vk if freedreno_kmds.length() != 0 and freedreno_kmds != [ 'msm' ] and with_freedreno_vk
@@ -1879,7 +1880,7 @@ elif with_amd_vk and with_aco_tests
error('ACO tests require LLVM, but LLVM is disabled.') error('ACO tests require LLVM, but LLVM is disabled.')
elif with_swrast_vk elif with_swrast_vk
error('lavapipe requires LLVM and is enabled, but LLVM is disabled.') error('lavapipe requires LLVM and is enabled, but LLVM is disabled.')
elif with_gallium_llvmpipe elif with_any_llvmpipe
error('llvmpipe requires LLVM and is enabled, but LLVM is disabled.') error('llvmpipe requires LLVM and is enabled, but LLVM is disabled.')
elif with_gallium_clover elif with_gallium_clover
error('The OpenCL "Clover" state tracker requires LLVM, but LLVM is disabled.') error('The OpenCL "Clover" state tracker requires LLVM, but LLVM is disabled.')

4
src/gallium/meson.build
View File

@@ -52,11 +52,11 @@ if with_any_llvmpipe
else else
driver_llvmpipe = declare_dependency() driver_llvmpipe = declare_dependency()
endif endif
if with_gallium_llvmpipe and with_gallium_softpipe if with_any_llvmpipe and with_gallium_softpipe
driver_swrast = declare_dependency( driver_swrast = declare_dependency(
dependencies : [ driver_softpipe, driver_llvmpipe ], dependencies : [ driver_softpipe, driver_llvmpipe ],
) )
elif with_gallium_llvmpipe elif with_any_llvmpipe
driver_swrast = driver_llvmpipe driver_swrast = driver_llvmpipe
elif with_gallium_softpipe elif with_gallium_softpipe
driver_swrast = driver_softpipe driver_swrast = driver_softpipe

4
src/meson.build
View File

@@ -104,7 +104,11 @@ if with_gallium_asahi or with_tools.contains('asahi')
endif endif
if with_gallium if with_gallium
subdir('mesa') subdir('mesa')
endif
if with_gallium_or_lvp
subdir('gallium') subdir('gallium')
endif
if with_gallium
# This has to be here since it requires libgallium, and subdir cannot # This has to be here since it requires libgallium, and subdir cannot
# contain .. # contain ..
if with_tests if with_tests