Module: Mesa Branch: main Commit: b2ce36b40b3a2d0516e8e3cdf3ff71453311663c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2ce36b40b3a2d0516e8e3cdf3ff71453311663c
Author: Samuel Pitoiset <[email protected]> Date: Tue Sep 5 17:54:30 2023 +0200 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 <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25062> --- .gitlab-ci/valve/gl_combined_testing.sh | 5 +---- src/gallium/drivers/zink/ci/deqp-zink-radv.toml | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/valve/gl_combined_testing.sh b/.gitlab-ci/valve/gl_combined_testing.sh index 1d622ca6749..c8f8d05e6d6 100755 --- 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 6fa6cb6d0ee..cd571a33808 100644 --- 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
