nir: Add a SSA type gathering pass

[mesa.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a153c3dae1c00a1a79267db847a940fff07e91c5..734d1f9e936c71978e3140f0622105e45e714d64 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,14 +126,16 @@ debian:
 # We also put softpipe (and therefore gallium nine, which requires
 # it) here, since softpipe/llvmpipe can't be built alongside classic
 # swrast.
-meson-gallium-swr:
+#
+# Putting glvnd here is arbitrary, but we want it in one of the builds
+# for coverage.
+meson-swr-glvnd:
   extends: .meson-build
   variables:
     UNWIND: "true"
     DRI_LOADERS: >
-      -D glx=disabled
-      -D egl=false
-      -D gbm=false
+      -D glvnd=true
+      -D egl=true
     GALLIUM_ST: >
       -D dri3=true
       -D gallium-vdpau=false
@@ -208,46 +210,7 @@ meson-main:
     GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,svga,v3d,vc4,virgl,etnaviv,panfrost,lima"
     LLVM_VERSION: "7"
 
-meson-glvnd:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glvnd=true
-      -D egl=true
-      -D gbm=true
-      -D glx=dri
-    DRI_DRIVERS: "i965"
-    GALLIUM_ST: >
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
-      -D gallium-nine=false
-      -D gallium-opencl=disabled
-
-meson-gallium-radeonsi:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D egl=false
-      -D gbm=false
-    GALLIUM_ST: >
-      -D dri3=false
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
-      -D gallium-nine=false
-      -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "radeonsi"
-    LLVM_VERSION: "7"
-
-meson-gallium-clover-llvm:
+meson-clover-llvm:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -266,8 +229,8 @@ meson-gallium-clover-llvm:
       -D gallium-opencl=icd
     GALLIUM_DRIVERS: "r600,radeonsi"
 
-meson-gallium-clover-llvm39:
-  extends: meson-gallium-clover-llvm
+meson-clover-llvm39:
+  extends: meson-clover-llvm
   variables:
     GALLIUM_DRIVERS: "i915,r600"
     LLVM_VERSION: "3.9"