From 31b7d17da4950c5715b12cc76e99bfc2589b71ea Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 21 May 2026 16:40:56 +0200
Subject: [PATCH] util: add a separate file for asahi vulkan drirc

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

diff --git a/src/util/00-hk-defaults.conf b/src/util/00-hk-defaults.conf
new file mode 100644
index 00000000000..e773712d5f1
--- /dev/null
+++ b/src/util/00-hk-defaults.conf
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<driconf>
+    <device driver="hk">
+        <engine engine_name_match="DXVK|vkd3d">
+           <!--
+              The amount of bug reports we get about Honeykrisp being slow
+           outweighs the number of games that need custom border emulation.
+           I'm tired.
+           -->
+           <option name="hk_disable_border_emulation" value="true" />
+           <!--
+            Needed for FL11_1. While nominally conformant, CTS hits piles
+            of timeouts (== flakes & fails & other fun times), especially on
+            min-spec M1. Therefore the feature is hidden. I don't expect native
+            apps to use this.
+            -->
+           <option name="hk_enable_vertex_pipeline_stores_atomics" value="true" />
+       </engine>
+
+        <engine engine_name_match="vkd3d">
+            <!--
+               Apple hardware lacks min/max filtering, but this is required for
+               FL12_0. Fortunately, this is an obscure feature and we support
+               the rest of FL12_0, so we prefer to fake support and fail D3D
+               conformance rather than be limited to FL11.
+               -->
+            <option name="hk_fake_minmax" value="true" />
+
+            <!---
+               We need this for FL12_0, but we only implement it for vkd3d
+               because it's not the speediest thing.
+               -->
+            <option name="hk_image_view_min_lod" value="true" />
+        </engine>
+    </device>
+</driconf>
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index ec6e3e6313b..56a49e84208 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -1083,39 +1083,6 @@ TODO: document the other workarounds.
             <option name="disable_explicit_sync_heuristic" value="true"/>
         </application>
     </device>
-    <device driver="hk">
-        <engine engine_name_match="DXVK|vkd3d">
-           <!--
-              The amount of bug reports we get about Honeykrisp being slow
-           outweighs the number of games that need custom border emulation.
-           I'm tired.
-           -->
-           <option name="hk_disable_border_emulation" value="true" />
-           <!--
-            Needed for FL11_1. While nominally conformant, CTS hits piles
-            of timeouts (== flakes & fails & other fun times), especially on
-            min-spec M1. Therefore the feature is hidden. I don't expect native
-            apps to use this.
-            -->
-           <option name="hk_enable_vertex_pipeline_stores_atomics" value="true" />
-        </engine>
-
-        <engine engine_name_match="vkd3d">
-            <!--
-               Apple hardware lacks min/max filtering, but this is required for
-               FL12_0. Fortunately, this is an obscure feature and we support
-               the rest of FL12_0, so we prefer to fake support and fail D3D
-               conformance rather than be limited to FL11.
-               -->
-            <option name="hk_fake_minmax" value="true" />
-
-            <!---
-               We need this for FL12_0, but we only implement it for vkd3d
-               because it's not the speediest thing.
-               -->
-            <option name="hk_image_view_min_lod" value="true" />
-        </engine>
-    </device>
     <device driver="panvk">
         <engine engine_name_match="ANGLE">
             <!--
diff --git a/src/util/meson.build b/src/util/meson.build
index 4ec391fc1e9..38a1f999c29 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -241,6 +241,10 @@ if with_gallium_asahi
   files_drirc += files('00-asahi-defaults.conf')
 endif
 
+if with_asahi_vk
+  files_drirc += files('00-hk-defaults.conf')
+endif
+
 if with_gallium_radeonsi
   files_drirc += files('00-radeonsi-defaults.conf')
 endif