vbo: don't look at the second draw's count when merging 2 glBegin/End draws

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94fa88301697ca7b9e15b317e8aaeac922f48b3e..63d3539c62bfb5c09e24a657b6ce69696c526a51 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,7 +131,7 @@ x86_test-gl:
 x86_test-vk:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-vk "2020-01-14"
+    DEBIAN_TAG: &x86_test-vk "2020-03-04"
   # Can only be triggered manually on personal branches because RADV is the only
   # driver that does Vulkan testing at the moment.
   rules:
@@ -722,19 +722,39 @@ radv_polaris10_vkcts:
   tags:
     - polaris10
 
+# Traces CI
 .traces-test:
-  extends:
-    - .test-gl
   cache:
     key: ${CI_JOB_NAME}
     paths:
       - .git-lfs-storage/
+
+.traces-test-gl:
+  extends:
+    - .test-gl
+    - .traces-test
   script:
-    - ./artifacts/tracie-runner.sh
+    - ./artifacts/tracie-runner-gl.sh
+
+.traces-test-vk:
+  extends:
+    - .test-vk
+    - .traces-test
+  script:
+    - ./artifacts/tracie-runner-vk.sh
 
 llvmpipe-traces:
+  extends: .traces-test-gl
   variables:
     LIBGL_ALWAYS_SOFTWARE: "true"
     GALLIUM_DRIVER: "llvmpipe"
-    DEVICE_NAME: "vmware-llvmpipe"
-  extends: .traces-test
+    DEVICE_NAME: "gl-vmware-llvmpipe"
+
+radv-polaris10-traces:
+  extends:
+    - .traces-test-vk
+    - .test-radv
+  variables:
+    DEVICE_NAME: "vk-amd-polaris10"
+  tags:
+    - polaris10