From 5fb44f6df0bcdda8dd46aa077e4602e1edfee83e Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Sun, 17 Nov 2024 08:53:00 +0100
Subject: [PATCH] zink+radv/ci: fix deqp binary used for gles tests

I did half the job in that commit: I split the two apis into two
invocations, but I didn't fix the binary used for the gles one...

Fixes: 14279087fb37b2869e6a ("ci/deqp-runner: split gl & gles groups to use the correct binary")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32250>
(cherry picked from commit 55eb200e818a20e33b7d4ebb99c250f7248f9247)
---
 .pick_status.json                             |  2 +-
 .../drivers/zink/ci/deqp-zink-radv.toml       | 32 +++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 0b17d277c23..bf9f1a789bb 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -214,7 +214,7 @@
         "description": "zink+radv/ci: fix deqp binary used for gles tests",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "14279087fb37b2869e6abfbc571ecc69184b5fe1",
         "notes": null
diff --git a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
index b05b6c4f599..44d6dee5477 100644
--- a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
+++ b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
@@ -1,10 +1,31 @@
 [[deqp]]
-deqp = "/deqp/external/openglcts/modules/glcts"
-caselists = [
-    "/deqp/mustpass/gles2-main.txt",
-    "/deqp/mustpass/gles3-main.txt",
-    "/deqp/mustpass/gles31-main.txt",
+deqp = "/deqp/modules/gles2/deqp-gles2"
+caselists = ["/deqp/mustpass/gles2-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
+renderer_check = "zink.*RADV"
+
+[[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
+
+[[deqp]]
+deqp = "/deqp/modules/gles31/deqp-gles31"
+caselists = ["/deqp/mustpass/gles31-main.txt"]
 deqp_args = [
     "--deqp-surface-width=256",
     "--deqp-surface-height=256",
@@ -28,7 +49,6 @@ deqp_args = [
     "--deqp-visibility=hidden"
 ]
 timeout = 180.0
-renderer_check = "zink.*RADV"
 
 [[piglit]]
 piglit_folder = "/piglit"