From 9e764757536eec7589a247031bdb92256fb393b2 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Tue, 24 Jun 2025 11:08:59 +0200
Subject: [PATCH] zink/ci: Only enable VVL for deqp on RADV

Don't try to enable Vulkan Validation Layers for piglit.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35717>
---
 src/gallium/drivers/zink/ci/deqp-zink-radv.toml | 8 ++++++++
 src/gallium/drivers/zink/ci/gitlab-ci.yml       | 2 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
index 16740b0d597..ba2f143a7e3 100644
--- a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
+++ b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
@@ -10,6 +10,8 @@ deqp_args = [
 ]
 timeout = 180.0
 renderer_check = "zink.*RADV"
+[deqp.env]
+  ZINK_DEBUG = "validation"
 
 [[deqp]]
 deqp = "/deqp-gles/modules/gles3/deqp-gles3"
@@ -22,6 +24,8 @@ deqp_args = [
     "--deqp-visibility=hidden"
 ]
 timeout = 180.0
+[deqp.env]
+  ZINK_DEBUG = "validation"
 
 [[deqp]]
 deqp = "/deqp-gles/modules/gles31/deqp-gles31"
@@ -35,6 +39,8 @@ deqp_args = [
 ]
 timeout = 180.0
 renderer_check = "zink.*RADV"
+[deqp.env]
+  ZINK_DEBUG = "validation"
 
 [[deqp]]
 deqp = "/deqp-gl/external/openglcts/modules/glcts"
@@ -49,6 +55,8 @@ deqp_args = [
     "--deqp-visibility=hidden"
 ]
 timeout = 180.0
+[deqp.env]
+  ZINK_DEBUG = "validation"
 
 [[piglit]]
 piglit_folder = "/piglit"
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 086d5662f95..05bbfa78274 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -256,7 +256,6 @@ zink-radv-vangogh-valve:
     CI_TRON_TIMEOUT__BOOT_CYCLE__MINUTES: 30
     CI_TRON_TIMEOUT__OVERALL__MINUTES: 30
     FDO_CI_CONCURRENT: 6
-    ZINK_DEBUG: vvl
     RADV_PERFTEST: hic
   # Override the list of tags to drop `ci-tron:priority:low`
   tags:
@@ -272,7 +271,6 @@ zink-radv-navi31-valve:
   variables:
     GPU_VERSION: zink-radv-navi31
     CI_TRON_TIMEOUT__OVERALL__MINUTES: 75
-    ZINK_DEBUG: vvl
     RADV_PERFTEST: hic
 
 zink-radv-cezanne: