From 22991d17a3e94a162dadaef19a122ac6922a0a0f Mon Sep 17 00:00:00 2001
From: Sviatoslav Peleshko <sviatoslav.peleshko@globallogic.com>
Date: Fri, 17 Nov 2023 14:49:28 +0200
Subject: [PATCH] drirc: Apply assume_full_subgroups_with_shared_memory to
 Resident Evil 2

The game uses a compute shader for occlusion culling. This shader lacks
proper groupshared memory sync, and needs 32-wide subgroup to work
correctly.

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7595
Signed-off-by: Sviatoslav Peleshko <sviatoslav.peleshko@globallogic.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23408>
(cherry picked from commit bd45b738b7f0c576c19b1bb5589c3bf7969f8ce4)
---
 .pick_status.json              | 2 +-
 src/util/00-mesa-defaults.conf | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 321e667d3ff..5a3b38ccdfc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2004,7 +2004,7 @@
         "description": "drirc: Apply assume_full_subgroups_with_shared_memory to Resident Evil 2",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 88a21b7c946..7db23603055 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -1169,6 +1169,9 @@ TODO: document the other workarounds.
             <option name="anv_assume_full_subgroups" value="32" />
             <option name="fp64_workaround_enabled" value="true" />
         </application>
+        <application name="RESIDENT EVIL 2" executable="re2.exe">
+            <option name="anv_assume_full_subgroups_with_shared_memory" value="true" />
+        </application>
         <application name="Wolfenstein: Youngblood(x64vk)" executable="Youngblood_x64vk.exe">
             <option name="limit_trig_input_range" value="true" />
         </application>