From 7ec22275f99f91c622aff763aafd9b4e3a7debae Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 21 May 2026 17:12:10 +0200
Subject: [PATCH] util,turnip: move drirc entries with vk_dont_care_as_load to
 Turnip

Turnip is the only driver using them, also rename to
tu_dont_care_as_load.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41731>
---
 src/freedreno/vulkan/tu_device.cc |  5 ++---
 src/util/00-mesa-defaults.conf    | 10 ----------
 src/util/00-turnip-defaults.conf  |  9 +++++++++
 src/util/driconf.h                |  8 ++++----
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc
index 64fe4a58664..2e450933709 100644
--- a/src/freedreno/vulkan/tu_device.cc
+++ b/src/freedreno/vulkan/tu_device.cc
@@ -1850,7 +1850,7 @@ static const driOptionDescription tu_dri_options[] = {
       DRI_CONF_VK_WSI_FORCE_BGRA8_UNORM_FIRST(false)
       DRI_CONF_VK_WSI_FORCE_SWAPCHAIN_TO_CURRENT_EXTENT(false)
       DRI_CONF_VK_X11_IGNORE_SUBOPTIMAL(false)
-      DRI_CONF_VK_DONT_CARE_AS_LOAD(false)
+      DRI_CONF_TU_DONT_CARE_AS_LOAD(false)
    DRI_CONF_SECTION_END
 
    DRI_CONF_SECTION_MISCELLANEOUS
@@ -1887,8 +1887,7 @@ tu_init_dri_options(struct tu_instance *instance)
 
    instance->force_vk_vendor =
          driQueryOptioni(&instance->dri_options, "force_vk_vendor");
-   instance->dont_care_as_load =
-         driQueryOptionb(&instance->dri_options, "vk_dont_care_as_load");
+   instance->dont_care_as_load = driQueryOptionb(&instance->dri_options, "tu_dont_care_as_load");
    instance->conservative_lrz =
          !driQueryOptionb(&instance->dri_options, "disable_conservative_lrz");
    instance->reserve_descriptor_set =
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index be1c9099fe3..6acc3bbf267 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -703,16 +703,6 @@
             <option name="vk_x11_strict_image_count" value="true" />
         </application>
 
-        <application name="Forsaken Remastered" executable="ForsakenEx">
-            <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/5437 -->
-            <option name="vk_dont_care_as_load" value="true" />
-        </application>
-
-        <application name="Spilled!" executable="Spilled!.exe">
-            <!-- Required for Turnip's GMEM mode running under Unity's Vulkan backend. -->
-            <option name="vk_dont_care_as_load" value="true" />
-        </application>
-
         <!-- Atlas Fallen Vulkan crashes with vsync turned off on xwayland without this workaround. -->
         <application name="Atlas Fallen" executable="AtlasFallen (VK).exe">
             <option name="vk_x11_strict_image_count" value="true" />
diff --git a/src/util/00-turnip-defaults.conf b/src/util/00-turnip-defaults.conf
index 9bbb9de1308..6a0f8dcd1a4 100644
--- a/src/util/00-turnip-defaults.conf
+++ b/src/util/00-turnip-defaults.conf
@@ -74,5 +74,14 @@
             -->
             <option name="tu_restrict_subgroup_size_64" value="true" />
         </application>
+        <application name="Forsaken Remastered" executable="ForsakenEx">
+            <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/5437 -->
+            <option name="tu_dont_care_as_load" value="true" />
+        </application>
+
+        <application name="Spilled!" executable="Spilled!.exe">
+            <!-- Required for Turnip's GMEM mode running under Unity's Vulkan backend. -->
+            <option name="tu_dont_care_as_load" value="true" />
+        </application>
     </device>
 </driconf>
diff --git a/src/util/driconf.h b/src/util/driconf.h
index 68f51c96b52..3849047a1e5 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -330,10 +330,6 @@
    DRI_CONF_OPT_B(ignore_map_unsynchronized, def, \
                   "Ignore GL_MAP_UNSYNCHRONIZED_BIT, workaround for games that use it incorrectly")
 
-#define DRI_CONF_VK_DONT_CARE_AS_LOAD(def) \
-   DRI_CONF_OPT_B(vk_dont_care_as_load, def, \
-                  "Treat VK_ATTACHMENT_LOAD_OP_DONT_CARE as LOAD_OP_LOAD, workaround on tiler GPUs for games that confuse these two load ops")
-
 #define DRI_CONF_VK_LOWER_TERMINATE_TO_DISCARD(def) \
    DRI_CONF_OPT_B(vk_lower_terminate_to_discard, def, \
                   "Lower terminate to discard (which is implicitly demote)")
@@ -672,6 +668,10 @@
    DRI_CONF_OPT_B(tu_restrict_subgroup_size_64, def, \
                   "Restrict subgroup size to 64 (instead of a max of 128) to work around games assuming desktop GPU 32/64 sizes")
 
+#define DRI_CONF_TU_DONT_CARE_AS_LOAD(def) \
+   DRI_CONF_OPT_B(tu_dont_care_as_load, def, \
+                  "Treat VK_ATTACHMENT_LOAD_OP_DONT_CARE as LOAD_OP_LOAD, workaround on tiler GPUs for games that confuse these two load ops")
+
 /**
  * \brief Honeykrisp specific configuration options
  */