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

meson: sort drivers alphabetically in any-of checks

Browse Source 
Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19977>
This commit is contained in:
Eric Engestrom
2022-11-24 10:27:57 +00:00
committed by Marge Bot
parent 5479234d45
commit 43eab9252e
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meson.build
View File

@@ -236,13 +236,13 @@ endforeach
with_gallium = gallium_drivers.length() != 0 with_gallium = gallium_drivers.length() != 0
with_gallium_kmsro = system_has_kms_drm and [ with_gallium_kmsro = system_has_kms_drm and [
with_gallium_asahi,
with_gallium_etnaviv,
with_gallium_freedreno,
with_gallium_lima,
with_gallium_panfrost,
with_gallium_v3d, with_gallium_v3d,
with_gallium_vc4, with_gallium_vc4,
with_gallium_etnaviv,
with_gallium_panfrost,
with_gallium_lima,
with_gallium_freedreno,
with_gallium_asahi,
].contains(true) ].contains(true)
with_dri = false with_dri = false
@@ -670,11 +670,11 @@ elif not with_platform_x11
_vdpau = 'disabled' _vdpau = 'disabled'
endif endif
elif not [ elif not [
with_gallium_d3d12_video,
with_gallium_nouveau,
with_gallium_r300, with_gallium_r300,
with_gallium_r600, with_gallium_r600,
with_gallium_radeonsi, with_gallium_radeonsi,
with_gallium_nouveau,
with_gallium_d3d12_video,
].contains(true) ].contains(true)
if _vdpau == 'enabled' if _vdpau == 'enabled'
error('VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau, d3d12 (with option gallium-d3d12-video).') error('VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau, d3d12 (with option gallium-d3d12-video).')
@@ -799,10 +799,10 @@ elif _va == 'false'
warning('gallium-va option "false" deprecated, please use "disabled" instead.') warning('gallium-va option "false" deprecated, please use "disabled" instead.')
endif endif
if not [ if not [
with_gallium_d3d12_video,
with_gallium_nouveau,
with_gallium_r600, with_gallium_r600,
with_gallium_radeonsi, with_gallium_radeonsi,
with_gallium_nouveau,
with_gallium_d3d12_video,
with_gallium_virgl, with_gallium_virgl,
].contains(true) ].contains(true)
if _va == 'enabled' if _va == 'enabled'
@@ -868,16 +868,16 @@ if with_gallium_st_nine
if not with_gallium_softpipe if not with_gallium_softpipe
error('The nine state tracker requires gallium softpipe/llvmpipe.') error('The nine state tracker requires gallium softpipe/llvmpipe.')
elif not [ elif not [
with_gallium_radeonsi, with_gallium_crocus,
with_gallium_nouveau, with_gallium_freedreno,
with_gallium_r600,
with_gallium_r300,
with_gallium_svga,
with_gallium_i915, with_gallium_i915,
with_gallium_iris, with_gallium_iris,
with_gallium_crocus, with_gallium_nouveau,
with_gallium_r300,
with_gallium_r600,
with_gallium_radeonsi,
with_gallium_svga,
with_gallium_zink, with_gallium_zink,
with_gallium_freedreno,
].contains(true) ].contains(true)
error('The nine state tracker requires at least one non-swrast gallium driver.') error('The nine state tracker requires at least one non-swrast gallium driver.')
endif endif