From 25d24b5a5946de61644a37f0d4361cd0646fd813 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Mon, 26 May 2025 12:01:51 -0400
Subject: [PATCH] hk: clean out unused driconf

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35189>
---
 src/asahi/vulkan/hk_instance.c |  4 ----
 src/asahi/vulkan/hk_instance.h |  1 -
 src/util/00-mesa-defaults.conf | 16 ----------------
 src/util/driconf.h             |  4 ----
 4 files changed, 25 deletions(-)

diff --git a/src/asahi/vulkan/hk_instance.c b/src/asahi/vulkan/hk_instance.c
index 4be7a763da7..69e315ff979 100644
--- a/src/asahi/vulkan/hk_instance.c
+++ b/src/asahi/vulkan/hk_instance.c
@@ -94,7 +94,6 @@ static const driOptionDescription hk_dri_options[] = {
    DRI_CONF_SECTION_END
 
    DRI_CONF_SECTION_MISCELLANEOUS
-      DRI_CONF_HK_DISABLE_RGBA4_BORDER_COLOR_WORKAROUND(false)
       DRI_CONF_HK_DISABLE_BORDER_EMULATION(false)
       DRI_CONF_HK_FAKE_MINMAX(false)
    DRI_CONF_SECTION_END
@@ -114,9 +113,6 @@ hk_init_dri_options(struct hk_instance *instance)
    instance->force_vk_vendor =
       driQueryOptioni(&instance->dri_options, "force_vk_vendor");
 
-   instance->workaround_rgba4 = !driQueryOptionb(
-      &instance->dri_options, "hk_disable_rgba4_border_color_workaround");
-
    instance->no_border =
       driQueryOptionb(&instance->dri_options, "hk_disable_border_emulation");
 
diff --git a/src/asahi/vulkan/hk_instance.h b/src/asahi/vulkan/hk_instance.h
index eb39fab8af5..34442ddfaa0 100644
--- a/src/asahi/vulkan/hk_instance.h
+++ b/src/asahi/vulkan/hk_instance.h
@@ -20,7 +20,6 @@ struct hk_instance {
    uint8_t driver_build_sha[20];
    uint32_t force_vk_vendor;
 
-   bool workaround_rgba4;
    bool no_border;
    bool fake_minmax;
 };
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 5040f93d195..86a9391e54f 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -1276,22 +1276,6 @@ TODO: document the other workarounds.
     </device>
 
     <device driver="hk">
-        <engine engine_name_match="DXVK">
-            <!--
-               Apple hardware natively supports D3D-order RGBA4 but not
-               Vulkan-order RGBA4. Technically, D3D added Vulkan-order RGBA4 to
-               support Dozen, but DXVK does not support it and no known games
-               use it. Disabling the workaround is safe for DXVK and reduces the
-               number of custom border titles.
-            -->
-            <option name="hk_disable_rgba4_border_color_workaround" value="true" />
-        </engine>
-        <application name="vkcube" executable="vkcube">
-            <option name="hk_disable_border_emulation" value="true" />
-        </application>
-        <application name="vkmark" executable="vkmark">
-            <option name="hk_disable_border_emulation" value="true" />
-        </application>
         <application name="Party Animals" executable="PartyAnimals.exe">
             <option name="hk_disable_border_emulation" value="true" />
         </application>
diff --git a/src/util/driconf.h b/src/util/driconf.h
index 7fb8e9d658a..3815ea3b991 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -643,10 +643,6 @@
    DRI_CONF_OPT_B(hk_disable_border_emulation, def, \
                   "Disable custom border colour emulation")
 
-#define DRI_CONF_HK_DISABLE_RGBA4_BORDER_COLOR_WORKAROUND(def) \
-   DRI_CONF_OPT_B(hk_disable_rgba4_border_color_workaround, def, \
-                  "Use hardware opaque_black, breaking certain RGBA4 formats")
-
 #define DRI_CONF_HK_FAKE_MINMAX(def) \
    DRI_CONF_OPT_B(hk_fake_minmax, def, \
                   "Fake support for min/max filtering")