1 files changed, 54 insertions, 9 deletions
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
index 9a5286a5be7..7fd3eb976e6 100644
--- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
@@ -1,6 +1,6 @@
 [[deqp]]
 deqp = "/deqp/modules/gles2/deqp-gles2"
-caselists = ["/deqp/mustpass/gles2-master.txt"]
+caselists = ["/deqp/mustpass/gles2-main.txt"]
 deqp_args = [
     "--deqp-surface-width=256",
     "--deqp-surface-height=256",
@@ -8,10 +8,12 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
     "--deqp-visibility=hidden"
 ]
+version_check = "GL ES 3.2.*git"
+renderer_check = "llvmpipe"
 
 [[deqp]]
 deqp = "/deqp/modules/gles3/deqp-gles3"
-caselists = ["/deqp/mustpass/gles3-master.txt"]
+caselists = ["/deqp/mustpass/gles3-main.txt"]
 deqp_args = [
     "--deqp-surface-width=256",
     "--deqp-surface-height=256",
@@ -22,7 +24,7 @@ deqp_args = [
 
 [[deqp]]
 deqp = "/deqp/modules/gles31/deqp-gles31"
-caselists = ["/deqp/mustpass/gles31-master.txt"]
+caselists = ["/deqp/mustpass/gles31-main.txt"]
 deqp_args = [
     "--deqp-surface-width=256",
     "--deqp-surface-height=256",
@@ -33,8 +35,22 @@ deqp_args = [
   [deqp.env]
   # Stress test NIR clone/serialization for GLES3.1 (which should cover most of the featureset).
   # Costs about 30% extra runtime.
-  NIR_TEST_CLONE = "true"
-  NIR_TEST_SERIALIZE = "true"
+  NIR_DEBUG="clone,serialize"
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+    "/deqp/mustpass/gles2-khr-main.txt",
+    "/deqp/mustpass/gles3-khr-main.txt",
+    "/deqp/mustpass/gles31-khr-main.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
 
 # Note that KHR-GL3* test sets include all tests from the previous
 # version, so we only need to run one test list (unlike dEQP-GLES,
@@ -42,10 +58,8 @@ deqp_args = [
 [[deqp]]
 deqp = "/deqp/external/openglcts/modules/glcts"
 caselists = [
-    "/deqp/mustpass/gles2-khr-master.txt",
-    "/deqp/mustpass/gles3-khr-master.txt",
-    "/deqp/mustpass/gles31-khr-master.txt",
-    "/deqp/mustpass/gl45-master.txt",
+    "/deqp/mustpass/gl45-main.txt",
+    "/deqp/mustpass/gl45-khr-single.txt",
 ]
 deqp_args = [
     "--deqp-surface-width=256",
@@ -54,3 +68,34 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
     "--deqp-visibility=hidden"
 ]
+
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-x11"
+caselists = ["/deqp/mustpass/egl-main.txt"]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-wayland"
+caselists = ["/deqp/mustpass/egl-main.txt"]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+prefix = "wayland-"
+
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "quick"
+process_isolation = true
+  [piglit.env]
+  # workaround for spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube
+  GALLIVM_PERF = "no_quad_lod"