From 33fbf9bf61f0cee6c867459a610b7d31e2dcd03f Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 26 Jan 2026 08:56:06 +0100
Subject: [PATCH] radv: fix applying radv_ssbo_non_uniform=true for Crysis 2/3
 remastered

DX11 games that use Vulkan interop for RT with a broken and too generic
app/engin name. This is very specific to these two games.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/14718
Fixes: 56813236f47 ("radv: use app names instead of exec name for shader based drirc workarounds")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39518>
(cherry picked from commit d679236e09acf153441be2225699990a52c364cb)
---
 .pick_status.json              | 2 +-
 src/util/00-radv-defaults.conf | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index c369f5b208d..82f1fff92c0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1264,7 +1264,7 @@
         "description": "radv: fix applying radv_ssbo_non_uniform=true for Crysis 2/3 remastered",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "56813236f47a8d2f8d7fe3dfb3909797176f6e82",
         "notes": null
diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
index 3ecd087af72..a7832aef9a2 100644
--- a/src/util/00-radv-defaults.conf
+++ b/src/util/00-radv-defaults.conf
@@ -187,11 +187,15 @@ Application bugs worked around in this file:
             <option name="radv_invariant_geom" value="true"/>
         </application>
 
-        <application name="Crysis 2 Remastered" application_name_match="Crysis2Remastered.exe">
+        <!-- Crysis 2/3 remastered are DX11 games that use Vulkan interop for RT
+             and the app/engine (nvpro-sample) seems too generic to apply the
+             drirc entry for. The executable name works just fine but that means
+             no pre-compilation for the RT shaders. -->
+        <application name="Crysis 2 Remastered" executable="Crysis2Remastered.exe">
             <option name="radv_ssbo_non_uniform" value="true" />
         </application>
 
-        <application name="Crysis 3 Remastered" application_name_match="Crysis3Remastered.exe">
+        <application name="Crysis 3 Remastered" executable="Crysis3Remastered.exe">
             <option name="radv_ssbo_non_uniform" value="true" />
         </application>