freedreno/a6xx: Don't take pipe_blit_info in emit_blit_dst

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66357057628c25f5de563d735b1dc838ec6058e7..51f06898ab7a86a0cce11e56b8834408bc404101 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -520,7 +520,7 @@ meson-testing:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D platforms=x11,drm,surfaceless
+      -D platforms=x11
     GALLIUM_ST: >
       -D dri3=enabled
     GALLIUM_DRIVERS: "swrast,virgl"
@@ -540,7 +540,7 @@ meson-gallium:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D platforms=x11,wayland,drm,surfaceless
+      -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
       -D gallium-extra-hud=true
@@ -555,6 +555,7 @@ meson-gallium:
     EXTRA_OPTION: >
       -D osmesa=gallium
       -D tools=all
+      -D werror=true
   script:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/run-shader-db.sh
@@ -584,7 +585,7 @@ meson-classic:
       -D glx=disabled
       -D gbm=disabled
       -D egl=enabled
-      -D platforms=surfaceless
+      -D platforms=[]
       -D osmesa=none
     GALLIUM_ST: >
       -D dri3=disabled
@@ -704,7 +705,7 @@ meson-clover-old-llvm:
       -D glx=disabled
       -D egl=disabled
       -D gbm=disabled
-      -D platforms=drm,surfaceless
+      -D platforms=[]
     GALLIUM_DRIVERS: "i915,r600"
   script:
     - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh
@@ -721,7 +722,7 @@ meson-vulkan:
       -D glx=disabled
       -D gbm=disabled
       -D egl=disabled
-      -D platforms=x11,wayland,drm
+      -D platforms=x11,wayland
       -D osmesa=none
     GALLIUM_ST: >
       -D dri3=enabled
@@ -1050,6 +1051,8 @@ arm64_a630_gles2:
 arm64_a630_gles31:
   extends: arm64_a630_gles2
   variables:
+    CI_NODE_INDEX: 1
+    CI_NODE_TOTAL: 2
     DEQP_VER: gles31
     # gles31 is about 12 minutes with validation enabled.
     NIR_VALIDATE: 0
@@ -1057,13 +1060,15 @@ arm64_a630_gles31:
 arm64_a630_gles3:
   extends: arm64_a630_gles2
   variables:
+    CI_NODE_INDEX: 1
+    CI_NODE_TOTAL: 2
     DEQP_VER: gles3
     # gles3 is about 15 minutes with validation enabled.
     NIR_VALIDATE: 0
 
 # We almost always manage to lower UBOs back to constant uploads in
 # the test suite, so get a little testing for it here.
-arm64_a630_noubo:
+.arm64_a630_noubo:
   extends: arm64_a630_gles31
   variables:
     DEQP_VER: gles31
@@ -1073,7 +1078,7 @@ arm64_a630_noubo:
 # The driver does some guessing as to whether to render using gmem
 # or bypass, and some GLES3.1 features interact with either one.
 # Do a little testing with gmem and bypass forced.
-arm64_a630_bypass:
+.arm64_a630_bypass:
   extends: arm64_a630_gles31
   variables:
     CI_NODE_INDEX: 1
@@ -1081,7 +1086,7 @@ arm64_a630_bypass:
     FD_MESA_DEBUG: nogmem
     DEQP_EXPECTED_FAILS: deqp-freedreno-a630-bypass-fails.txt
 
-arm64_a630_traces:
+.arm64_a630_traces:
   extends:
     - arm64_a630_gles2
   variables:
@@ -1096,7 +1101,7 @@ arm64_a630_traces:
 # Along with checking gmem path, check that we don't get obvious nir
 # validation failures (though it's too expensive to have it on for the
 # full CTS)
-arm64_a630_gmem:
+.arm64_a630_gmem:
   extends: arm64_a630_gles31
   variables:
     CI_NODE_INDEX: 1
@@ -1104,7 +1109,7 @@ arm64_a630_gmem:
     FD_MESA_DEBUG: nobypass
     NIR_VALIDATE: 1
 
-arm64_a630_vk:
+.arm64_a630_vk:
   extends: arm64_a630_gles2
   variables:
     DEQP_VER: vk
@@ -1120,9 +1125,9 @@ arm64_a630_vk:
 # Do a separate sysmem pass over the testcases that really affect sysmem
 # rendering.  This is currently very flaky, leave it as an option for devs
 # to click play on in their branches.
-arm64_a630_vk_sysmem:
+.arm64_a630_vk_sysmem:
   extends:
-    - arm64_a630_vk
+    - .arm64_a630_vk
   variables:
     CI_NODE_INDEX: 1
     CI_NODE_TOTAL: 10