Mesa (master): gitlab-ci: build swr in meson-main

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e6d26d77a3271b788383d10230e3a9fe33a3fe70
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6d26d77a3271b788383d10230e3a9fe33a3fe70

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Nov 19 14:36:02 2019 +0100

gitlab-ci: build swr in meson-main

Now that debugoptimized isn't set and that all test jobs depend on
meson-testing, enabling swr shouldn't slowdown the CI.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>

---

 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4e9177c202..4f742d430b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -249,7 +249,7 @@ meson-main:
       -D gallium-xa=true
       -D gallium-nine=true
       -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink"
+    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink"
     LLVM_VERSION: "7"
     EXTRA_OPTION: >
       -D osmesa=gallium
@@ -329,7 +329,7 @@ meson-swr-glvnd:
       -D gallium-xa=false
       -D gallium-nine=false
       -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "swr,iris"
+    GALLIUM_DRIVERS: "iris"
     LLVM_VERSION: "6.0"
 
 meson-clang: