zink/ci: merge GLCTS testing with GLESx for RADV

Both testsuites used to be executed separately because of spurious
failures/hangs but they seem fixed now.

GLCTS+GLES might be faster to run now.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25062>

diff --git a/.gitlab-ci/valve/gl_combined_testing.sh b/.gitlab-ci/valve/gl_combined_testing.sh
index 1d622ca..c8f8d05 100755 (executable)
--- a/.gitlab-ci/valve/gl_combined_testing.sh
+++ b/.gitlab-ci/valve/gl_combined_testing.sh
@@ -16,10 +16,7 @@ function execute_testsuite {
     fi
 }
 
-echo -e "\n# GL CTS testing"
-DEQP_VER=gl46 execute_testsuite gl ./install/deqp-runner.sh
-
-echo -e "\n# GLES CTS testing"
+echo -e "\n# GLES/GL CTS testing"
 DEQP_SUITE=zink-radv execute_testsuite gles ./install/deqp-runner.sh
 
 echo -e "\n# Piglit testing"

diff --git a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
index 6fa6cb6..cd571a3 100644 (file)
--- a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
+++ b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
@@ -33,3 +33,17 @@ deqp_args = [
     "--deqp-visibility=hidden"
 ]
 timeout = 180.0
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = [
+    "/deqp/mustpass/gl46-master.txt",
+]
+deqp_args = [
+    "--deqp-surface-width=256",
+    "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+    "--deqp-visibility=hidden"
+]
+timeout = 180.0