From 7599fa8322e6123cdb49d1936c4ea0dadb967244 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 21 May 2026 16:12:36 +0200
Subject: [PATCH] util: add a separate file for NVK 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 | 18 ------------------
 src/util/00-nvk-defaults.conf  | 21 +++++++++++++++++++++
 src/util/meson.build           |  4 ++++
 3 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 src/util/00-nvk-defaults.conf

diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index e21872f35ea..4e3faacd7df 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -1004,24 +1004,6 @@ TODO: document the other workarounds.
             <option name="mesa_extension_override" value="+GL_ARB_texture_view" />
         </application>
     </device>
-    <device driver="nvk">
-        <application name="Artifact Classic" executable="dcg">
-            <option name="force_vk_vendor" value="-1" />
-        </application>
-        <application name="Deep Rock Galactic" executable="FSD.exe">
-            <!-- Tries to use NvAPI_D3D11_CreateCubinComputeShaderWithName otherwise -->
-            <option name="force_vk_vendor" value="-1" />
-        </application>
-        <application name="Metro Exodus (Linux native)" application_name_match="metroexodus">
-            <option name="nvk_app_layer" value="metroexodus" />
-        </application>
-        <application name="No Man's Sky" executable="NMS.exe">
-            <option name="force_vk_vendor" value="-1" />
-        </application>
-        <application name="X4 Foundations" executable="X4">
-            <option name="force_vk_vendor" value="-1" />
-        </application>
-    </device>
     <device driver="r300">
         <!-- Only one app can use Hyperz at a time. -->
         <application name="X server" executable="X">
diff --git a/src/util/00-nvk-defaults.conf b/src/util/00-nvk-defaults.conf
new file mode 100644
index 00000000000..a915da43308
--- /dev/null
+++ b/src/util/00-nvk-defaults.conf
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<driconf>
+    <device driver="nvk">
+        <application name="Artifact Classic" executable="dcg">
+            <option name="force_vk_vendor" value="-1" />
+        </application>
+        <application name="Deep Rock Galactic" executable="FSD.exe">
+            <!-- Tries to use NvAPI_D3D11_CreateCubinComputeShaderWithName otherwise -->
+            <option name="force_vk_vendor" value="-1" />
+        </application>
+        <application name="Metro Exodus (Linux native)" application_name_match="metroexodus">
+            <option name="nvk_app_layer" value="metroexodus" />
+        </application>
+        <application name="No Man's Sky" executable="NMS.exe">
+            <option name="force_vk_vendor" value="-1" />
+        </application>
+        <application name="X4 Foundations" executable="X4">
+            <option name="force_vk_vendor" value="-1" />
+        </application>
+    </device>
+</driconf>
diff --git a/src/util/meson.build b/src/util/meson.build
index aeb73330f09..670a8dd352d 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -221,6 +221,10 @@ if with_intel_vk
   files_drirc += files('00-anv-defaults.conf')
 endif
 
+if with_nouveau_vk
+  files_drirc += files('00-nvk-defaults.conf')
+endif
+
 if with_freedreno_vk
   files_drirc += files('00-turnip-defaults.conf')
 endif