From c98ea7d2c9b87be2b7cf0e8565b91801dd1d970d Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 21 May 2026 17:27:33 +0200
Subject: [PATCH] util,asahi: move drirc entries with no_fp16 to asahi

Asahi is the only driver using them, also rename to asahi_no_fp16.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41731>
---
 src/gallium/drivers/asahi/agx_pipe.c      |  2 +-
 src/gallium/drivers/asahi/driinfo_asahi.h |  2 +-
 src/util/00-asahi-defaults.conf           | 34 +++++++++++++++++++++++
 src/util/00-mesa-defaults.conf            | 33 ----------------------
 src/util/driconf.h                        | 11 +++++---
 5 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/src/gallium/drivers/asahi/agx_pipe.c b/src/gallium/drivers/asahi/agx_pipe.c
index f9e006a8596..b3420c76f03 100644
--- a/src/gallium/drivers/asahi/agx_pipe.c
+++ b/src/gallium/drivers/asahi/agx_pipe.c
@@ -2445,7 +2445,7 @@ agx_screen_create(int fd, struct renderonly *ro,
    /* Forward no16 flag from driconf. This must happen after opening the device,
     * since agx_open_device sets debug.
     */
-   if (driQueryOptionb(config->options, "no_fp16"))
+   if (driQueryOptionb(config->options, "asahi_no_fp16"))
       agx_screen->dev.debug |= AGX_DBG_NO16;
 
    int ret =
diff --git a/src/gallium/drivers/asahi/driinfo_asahi.h b/src/gallium/drivers/asahi/driinfo_asahi.h
index e9eb7ea849d..85e832678f3 100644
--- a/src/gallium/drivers/asahi/driinfo_asahi.h
+++ b/src/gallium/drivers/asahi/driinfo_asahi.h
@@ -2,5 +2,5 @@
 
 /* clang-format off */
 DRI_CONF_SECTION_MISCELLANEOUS
-   DRI_CONF_NO_FP16(false)
+   DRI_CONF_ASAHI_NO_FP16(false)
 DRI_CONF_SECTION_END
diff --git a/src/util/00-asahi-defaults.conf b/src/util/00-asahi-defaults.conf
index 73a3fab0723..32006f78155 100644
--- a/src/util/00-asahi-defaults.conf
+++ b/src/util/00-asahi-defaults.conf
@@ -44,5 +44,39 @@
         <application name="Waterfox" executable="waterfox">
             <option name="force_gl_renderer" value="AGX G13/G14"/>
         </application>
+
+        <!-- Disable fp16 support for browsers, since there is too much
+             broken WebGL out there that uses the wrong precision.
+             Bonus workaround for Firefox bug #1845309. -->
+        <application name="Firefox" executable="firefox">
+            <option name="asahi_no_fp16" value="true" />
+        </application>
+        <application name="Firefox ESR" executable="firefox-esr">
+            <option name="asahi_no_fp16" value="true" />
+        </application>
+        <application name="Chromium" executable="chromium">
+            <option name="asahi_no_fp16" value="true" />
+        </application>
+        <application name="Google Chrome" executable="chrome">
+            <option name="asahi_no_fp16" value="true" />
+        </application>
+        <application name="Iceweasel" executable="iceweasel">
+            <option name="asahi_no_fp16" value="true" />
+        </application>
+        <application name="Epiphany" executable="epiphany">
+            <option name="asahi_no_fp16" value="true" />
+        </application>
+        <application name="Konqueror" executable="konqueror">
+            <option name="asahi_no_fp16" value="true" />
+        </application>
+        <application name="Falkon" executable="falkon">
+            <option name="asahi_no_fp16" value="true" />
+        </application>
+        <application name="Seamonkey" executable="seamonkey">
+            <option name="asahi_no_fp16" value="true" />
+        </application>
+        <application name="Waterfox" executable="waterfox">
+            <option name="asahi_no_fp16" value="true" />
+        </application>
     </device>
 </driconf>
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 6acc3bbf267..9368cc0d3d1 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -708,39 +708,6 @@
             <option name="vk_x11_strict_image_count" value="true" />
         </application>
 
-        <!-- Disable fp16 support for browsers, since there is too much
-             broken WebGL out there that uses the wrong precision.
-             Bonus workaround for Firefox bug #1845309. -->
-        <application name="Firefox" executable="firefox">
-            <option name="no_fp16" value="true" />
-        </application>
-        <application name="Firefox ESR" executable="firefox-esr">
-            <option name="no_fp16" value="true" />
-        </application>
-        <application name="Chromium" executable="chromium">
-            <option name="no_fp16" value="true" />
-        </application>
-        <application name="Google Chrome" executable="chrome">
-            <option name="no_fp16" value="true" />
-        </application>
-        <application name="Iceweasel" executable="iceweasel">
-            <option name="no_fp16" value="true" />
-        </application>
-        <application name="Epiphany" executable="epiphany">
-            <option name="no_fp16" value="true" />
-        </application>
-        <application name="Konqueror" executable="konqueror">
-            <option name="no_fp16" value="true" />
-        </application>
-        <application name="Falkon" executable="falkon">
-            <option name="no_fp16" value="true" />
-        </application>
-        <application name="Seamonkey" executable="seamonkey">
-            <option name="no_fp16" value="true" />
-        </application>
-        <application name="Waterfox" executable="waterfox">
-            <option name="no_fp16" value="true" />
-        </application>
         <!-- Game does not consider larger image count in non-vsynced modes. -->
         <application name="Detroit Become Human" application_name_match="DetroitBecomeHuman">
             <option name="vk_x11_strict_image_count" value="true" />
diff --git a/src/util/driconf.h b/src/util/driconf.h
index 3849047a1e5..de6be4d06ae 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -521,10 +521,6 @@
    DRI_CONF_OPT_B(vertex_program_default_out, def, \
                   "Initialize outputs of vertex program to a default value vec4(0, 0, 0, 1)")
 
-#define DRI_CONF_NO_FP16(def) \
-   DRI_CONF_OPT_B(no_fp16, def, \
-                  "Disable 16-bit float support")
-
 #define DRI_CONF_VK_ZERO_VRAM(def) \
    DRI_CONF_OPT_B(vk_zero_vram, def, \
                   "Initialize to zero all VRAM allocations")
@@ -738,4 +734,11 @@
 
  #define DRI_CONF_NVK_APP_LAYER() DRI_CONF_OPT_S_NODEF(nvk_app_layer, "Select an application layer.")
 
+/**
+ * \brief Asahi specific configuration options
+ */
+#define DRI_CONF_ASAHI_NO_FP16(def) \
+   DRI_CONF_OPT_B(asahi_no_fp16, def, \
+                  "Disable 16-bit float support")
+
 #endif