summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2019-11-19 14:36:02 +0100
committerSamuel Pitoiset <[email protected]>2019-11-21 09:35:05 +0100
commite6d26d77a3271b788383d10230e3a9fe33a3fe70 (patch)
tree3922515173e94afb29d3e74ff01c0fe081234977 /.gitlab-ci.yml
parent6cf9b53fa2423aac1e01fe991710bfcbcec2d2d5 (diff)
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 <[email protected]> Reviewed-by: Michel Dänzer <[email protected]>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files 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: