diff options
| author | Eric Engestrom <eric@igalia.com> | 2022-11-24 10:27:57 +0000 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-12-01 23:53:08 +0000 |
| commit | 43eab9252ee7e27bb226669686ba1c121bec1f40 (patch) | |
| tree | 5ffb8df74b5010c34aa6f599be90d458ce749b86 /meson.build | |
| parent | 5479234d45aabda47cbb08af321ee2a486763e40 (diff) | |
| download | mesa-43eab9252ee7e27bb226669686ba1c121bec1f40.tar.gz | |
meson: sort drivers alphabetically in any-of checks
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>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meson.build b/meson.build index b4fb5bc99d2..1e6ccd8cbb9 100644 --- a/meson.build +++ b/meson.build @@ -236,13 +236,13 @@ endforeach with_gallium = gallium_drivers.length() != 0 with_gallium_kmsro = system_has_kms_drm and [ - with_gallium_v3d, - with_gallium_vc4, + with_gallium_asahi, with_gallium_etnaviv, - with_gallium_panfrost, - with_gallium_lima, with_gallium_freedreno, - with_gallium_asahi, + with_gallium_lima, + with_gallium_panfrost, + with_gallium_v3d, + with_gallium_vc4, ].contains(true) with_dri = false @@ -670,11 +670,11 @@ elif not with_platform_x11 _vdpau = 'disabled' endif elif not [ + with_gallium_d3d12_video, + with_gallium_nouveau, with_gallium_r300, with_gallium_r600, with_gallium_radeonsi, - with_gallium_nouveau, - with_gallium_d3d12_video, ].contains(true) 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).') @@ -799,10 +799,10 @@ elif _va == 'false' warning('gallium-va option "false" deprecated, please use "disabled" instead.') endif if not [ + with_gallium_d3d12_video, + with_gallium_nouveau, with_gallium_r600, with_gallium_radeonsi, - with_gallium_nouveau, - with_gallium_d3d12_video, with_gallium_virgl, ].contains(true) if _va == 'enabled' @@ -868,16 +868,16 @@ if with_gallium_st_nine if not with_gallium_softpipe error('The nine state tracker requires gallium softpipe/llvmpipe.') elif not [ - with_gallium_radeonsi, + with_gallium_crocus, + with_gallium_freedreno, + with_gallium_i915, + with_gallium_iris, with_gallium_nouveau, - with_gallium_r600, with_gallium_r300, + with_gallium_r600, + with_gallium_radeonsi, with_gallium_svga, - with_gallium_i915, - with_gallium_iris, - with_gallium_crocus, with_gallium_zink, - with_gallium_freedreno, ].contains(true) error('The nine state tracker requires at least one non-swrast gallium driver.') endif |