From 25bf8e968249f59a82bcf2997625d4f484bc94af Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Sat, 16 Nov 2024 11:24:08 +0100
Subject: [PATCH] zink+nvk/ci: fix deqp binary used for gles tests

Fixes: 5a6ffd1420cecb9d060f ("zink/ci: add zink+nvk glcts+piglit job on a GA106 (RTX 3060)")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32250>
---
 .../drivers/zink/ci/deqp-zink-nvk.toml        | 48 ++++++++++++++++---
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/deqp-zink-nvk.toml b/src/gallium/drivers/zink/ci/deqp-zink-nvk.toml
index 1d5b0ab9ae4..1736b3ae871 100644
--- a/src/gallium/drivers/zink/ci/deqp-zink-nvk.toml
+++ b/src/gallium/drivers/zink/ci/deqp-zink-nvk.toml
@@ -1,11 +1,6 @@
 [[deqp]]
-deqp = "/deqp/external/openglcts/modules/glcts"
-caselists = [
-    "/deqp/mustpass/gles2-main.txt",
-    "/deqp/mustpass/gles3-main.txt",
-    "/deqp/mustpass/gles31-main.txt",
-    "/deqp/mustpass/gl46-main.txt",
-]
+deqp = "/deqp/modules/gles2/deqp-gles2"
+caselists = ["/deqp/mustpass/gles2-main.txt"]
 deqp_args = [
     "--deqp-surface-width=256",
     "--deqp-surface-height=256",
@@ -17,6 +12,45 @@ timeout = 180.0
 tests_per_group = 1000
 renderer_check = "zink.*NVK"
 
+[[deqp]]
+deqp = "/deqp/modules/gles3/deqp-gles3"
+caselists = ["/deqp/mustpass/gles3-main.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
+tests_per_group = 1000
+
+[[deqp]]
+deqp = "/deqp/modules/gles31/deqp-gles31"
+caselists = ["/deqp/mustpass/gles31-main.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
+tests_per_group = 1000
+
+[[deqp]]
+deqp = "/deqp/external/openglcts/modules/glcts"
+caselists = ["/deqp/mustpass/gl46-main.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
+tests_per_group = 1000
+
 [[piglit]]
 piglit_folder = "/piglit"
 profile = "gpu"