From aba4094636dd7f4ef1541b5143622c043411957a Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 21 May 2026 15:54:34 +0200
Subject: [PATCH] util: add a separate file for RadeonSI drirc

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41731>
---
 src/util/00-mesa-defaults.conf     | 82 ----------------------------
 src/util/00-radeonsi-defaults.conf | 85 ++++++++++++++++++++++++++++++
 src/util/meson.build               |  4 ++
 3 files changed, 89 insertions(+), 82 deletions(-)
 create mode 100644 src/util/00-radeonsi-defaults.conf

diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 62fb6193ee0..7d5765d708e 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -809,88 +809,6 @@ TODO: document the other workarounds.
             <option name="glx_extension_override" value="-GLX_OML_sync_control" />
         </application>
     </device>
-    <device driver="radeonsi">
-        <application name="Alien Isolation" executable="AlienIsolation">
-            <option name="force_gl_vendor" value="X.Org" />
-        </application>
-        <application name="American Truck Simulator" executable="amtrucks">
-            <option name="radeonsi_zerovram" value="true" />
-        </application>
-        <application name="Counter-Strike Global Offensive" executable="csgo_linux64">
-            <option name="radeonsi_zerovram" value="true" />
-            <option name="radeonsi_clamp_div_by_zero" value="true" />
-        </application>
-        <application name="Exanima" executable="Exanima.exe">
-            <option name="radeonsi_zerovram" value="true"/>
-        </application>
-        <application name="Nowhere Patrol" executable="NowherePatrol.exe">
-            <option name="radeonsi_zerovram" value="true" />
-        </application>
-        <application name="Rocket League" executable="RocketLeague">
-            <option name="radeonsi_zerovram" value="true" />
-        </application>
-
-        <!-- This applies to all apps having "runner" as their executable, but that's OK.
-            Apps where this workaround is needed:
-            - Monolith demo5
-            - Memoranda
-            - Nuclear Throne
-            - Peace, Death!
-            - Riptale
-            - Turmoil
-            - Undertale
-        -->
-        <!-- YoYo game engine workarounds -->
-        <application name="any runner executable" executable="runner">
-            <option name="radeonsi_sync_compile" value="true" />
-            <option name="radeonsi_zerovram" value="true" />
-        </application>
-        <application name="Gun Godz" executable="GUNGODZ">
-            <option name="radeonsi_sync_compile" value="true" />
-        </application>
-
-        <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/2647 -->
-        <application name="Kerbal Space Program" executable="KSP.x86_64">
-            <option name="radeonsi_no_infinite_interp" value="true" />
-        </application>
-        <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/2686 -->
-        <application name="7 Days to Die" executable="7DaysToDie.x86_64">
-            <option name="radeonsi_zerovram" value="true" />
-        </application>
-        <application name="7 Days to Die" executable="7DaysToDie.x86">
-            <option name="radeonsi_zerovram" value="true" />
-        </application>
-        <application name="SPECviewperf13" executable="viewperf">
-            <option name="radeonsi_sync_compile" value="true" />
-        </application>
-        <application name="Road Redemption" executable="RoadRedemption.x86_64">
-            <option name="radeonsi_clamp_div_by_zero" value="true" />
-        </application>
-        <application name="Wasteland 2" executable="WL2">
-            <option name="radeonsi_clamp_div_by_zero" value="true" />
-        </application>
-        <application name="Teardown" executable="teardown.exe">
-            <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/3714 -->
-            <option name="radeonsi_clamp_div_by_zero" value="true" />
-            <option name="radeonsi_no_infinite_interp" value="true" />
-        </application>
-        <application name="SpaceEngine" executable="SpaceEngine.exe">
-            <option name="force_gl_vendor" value="X.Org" />
-        </application>
-        <application name="BETA CAE Systems - GL detect tool" executable="detect_opengl_tool">
-            <option name="force_gl_vendor" value="ATI Technologies Inc." />
-        </application>
-        <application name="BETA CAE Systems - ANSA" executable="ansa_linux_x86_64">
-            <option name="force_gl_vendor" value="ATI Technologies Inc." />
-        </application>
-        <application name="BETA CAE Systems - META" executable="meta_post_x86_64">
-            <option name="force_gl_vendor" value="ATI Technologies Inc." />
-            <option name="radeonsi_force_use_fma32" value="true" />
-        </application>
-        <application name="Black Geyser: Couriers of Darkness" executable="BlackGeyser.x86_64">
-            <option name="radeonsi_zerovram" value="true" />
-        </application>
-    </device>
     <device driver="iris">
         <application name="Middle Earth: Shadow of Mordor" executable="ShadowOfMordor">
             <option name="vs_position_always_invariant" value="true" />
diff --git a/src/util/00-radeonsi-defaults.conf b/src/util/00-radeonsi-defaults.conf
new file mode 100644
index 00000000000..6a3613a3ec2
--- /dev/null
+++ b/src/util/00-radeonsi-defaults.conf
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<driconf>
+    <device driver="radeonsi">
+        <application name="Alien Isolation" executable="AlienIsolation">
+            <option name="force_gl_vendor" value="X.Org" />
+        </application>
+        <application name="American Truck Simulator" executable="amtrucks">
+            <option name="radeonsi_zerovram" value="true" />
+        </application>
+        <application name="Counter-Strike Global Offensive" executable="csgo_linux64">
+            <option name="radeonsi_zerovram" value="true" />
+            <option name="radeonsi_clamp_div_by_zero" value="true" />
+        </application>
+        <application name="Exanima" executable="Exanima.exe">
+            <option name="radeonsi_zerovram" value="true"/>
+        </application>
+        <application name="Nowhere Patrol" executable="NowherePatrol.exe">
+            <option name="radeonsi_zerovram" value="true" />
+        </application>
+        <application name="Rocket League" executable="RocketLeague">
+            <option name="radeonsi_zerovram" value="true" />
+        </application>
+
+        <!-- This applies to all apps having "runner" as their executable, but that's OK.
+            Apps where this workaround is needed:
+            - Monolith demo5
+            - Memoranda
+            - Nuclear Throne
+            - Peace, Death!
+            - Riptale
+            - Turmoil
+            - Undertale
+        -->
+        <!-- YoYo game engine workarounds -->
+        <application name="any runner executable" executable="runner">
+            <option name="radeonsi_sync_compile" value="true" />
+            <option name="radeonsi_zerovram" value="true" />
+        </application>
+        <application name="Gun Godz" executable="GUNGODZ">
+            <option name="radeonsi_sync_compile" value="true" />
+        </application>
+
+        <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/2647 -->
+        <application name="Kerbal Space Program" executable="KSP.x86_64">
+            <option name="radeonsi_no_infinite_interp" value="true" />
+        </application>
+        <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/2686 -->
+        <application name="7 Days to Die" executable="7DaysToDie.x86_64">
+            <option name="radeonsi_zerovram" value="true" />
+        </application>
+        <application name="7 Days to Die" executable="7DaysToDie.x86">
+            <option name="radeonsi_zerovram" value="true" />
+        </application>
+        <application name="SPECviewperf13" executable="viewperf">
+            <option name="radeonsi_sync_compile" value="true" />
+        </application>
+        <application name="Road Redemption" executable="RoadRedemption.x86_64">
+            <option name="radeonsi_clamp_div_by_zero" value="true" />
+        </application>
+        <application name="Wasteland 2" executable="WL2">
+            <option name="radeonsi_clamp_div_by_zero" value="true" />
+        </application>
+        <application name="Teardown" executable="teardown.exe">
+            <!-- https://gitlab.freedesktop.org/mesa/mesa/-/issues/3714 -->
+            <option name="radeonsi_clamp_div_by_zero" value="true" />
+            <option name="radeonsi_no_infinite_interp" value="true" />
+        </application>
+        <application name="SpaceEngine" executable="SpaceEngine.exe">
+            <option name="force_gl_vendor" value="X.Org" />
+        </application>
+        <application name="BETA CAE Systems - GL detect tool" executable="detect_opengl_tool">
+            <option name="force_gl_vendor" value="ATI Technologies Inc." />
+        </application>
+        <application name="BETA CAE Systems - ANSA" executable="ansa_linux_x86_64">
+            <option name="force_gl_vendor" value="ATI Technologies Inc." />
+        </application>
+        <application name="BETA CAE Systems - META" executable="meta_post_x86_64">
+            <option name="force_gl_vendor" value="ATI Technologies Inc." />
+            <option name="radeonsi_force_use_fma32" value="true" />
+        </application>
+        <application name="Black Geyser: Couriers of Darkness" executable="BlackGeyser.x86_64">
+            <option name="radeonsi_zerovram" value="true" />
+        </application>
+    </device>
+</driconf>
diff --git a/src/util/meson.build b/src/util/meson.build
index 58b293a0087..e3fb22d57e3 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -217,6 +217,10 @@ if with_amd_vk
   files_drirc += files('00-radv-defaults.conf')
 endif
 
+if with_gallium_radeonsi
+  files_drirc += files('00-radeonsi-defaults.conf')
+endif
+
 if with_gallium_zink
   files_drirc += files('00-zink-defaults.conf')
 endif