From 4c3582893382af2fd39d98d483d73a966fc76681 Mon Sep 17 00:00:00 2001
From: Friedrich Vock <friedrich.vock@gmx.de>
Date: Fri, 8 Mar 2024 17:13:28 +0100
Subject: [PATCH] radv,driconf: Remove active accel struct workaround

Now unused and enabled by default.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28077>
---
 src/amd/vulkan/radv_instance.c | 4 ----
 src/amd/vulkan/radv_private.h  | 1 -
 src/util/00-radv-defaults.conf | 5 -----
 src/util/driconf.h             | 4 ----
 4 files changed, 14 deletions(-)

diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c
index 691dd720b9e..89e3b36c90f 100644
--- a/src/amd/vulkan/radv_instance.c
+++ b/src/amd/vulkan/radv_instance.c
@@ -167,7 +167,6 @@ static const driOptionDescription radv_dri_options[] = {
       DRI_CONF_RADV_OVERRIDE_COMPUTE_SHADER_VERSION(0)
       DRI_CONF_RADV_OVERRIDE_RAY_TRACING_SHADER_VERSION(0)
       DRI_CONF_RADV_SSBO_NON_UNIFORM(false)
-      DRI_CONF_RADV_FORCE_ACTIVE_ACCEL_STRUCT_LEAVES(false)
       DRI_CONF_RADV_APP_LAYER()
    DRI_CONF_SECTION_END
 };
@@ -262,9 +261,6 @@ radv_init_dri_options(struct radv_instance *instance)
 
    instance->drirc.vk_require_etc2 = driQueryOptionb(&instance->drirc.options, "vk_require_etc2");
    instance->drirc.vk_require_astc = driQueryOptionb(&instance->drirc.options, "vk_require_astc");
-
-   instance->drirc.force_active_accel_struct_leaves =
-      driQueryOptionb(&instance->drirc.options, "radv_force_active_accel_struct_leaves");
 }
 
 static const struct vk_instance_extension_table radv_instance_extensions_supported = {
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 874c996f0d4..8516755c9ff 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -425,7 +425,6 @@ struct radv_instance {
       bool report_llvm9_version_string;
       bool vk_require_etc2;
       bool vk_require_astc;
-      bool force_active_accel_struct_leaves;
       char *app_layer;
       uint8_t override_graphics_shader_version;
       uint8_t override_compute_shader_version;
diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
index 31542b96a90..c19f895b533 100644
--- a/src/util/00-radv-defaults.conf
+++ b/src/util/00-radv-defaults.conf
@@ -107,7 +107,6 @@ Application bugs worked around in this file:
         <application name="DOOM Eternal" application_name_match="DOOMEternal">
             <option name="radv_zero_vram" value="true" />
             <option name="radv_legacy_sparse_binding" value="true" />
-            <option name="radv_force_active_accel_struct_leaves" value="true" />
         </application>
 
         <application name="No Man's Sky" application_name_match="No Man's Sky">
@@ -164,10 +163,6 @@ Application bugs worked around in this file:
             <option name="radv_disable_ngg_gs" value="true" />
         </application>
 
-        <application name="Star Wars: Jedi Survivor" executable="JediSurvivor.exe">
-            <option name="radv_force_active_accel_struct_leaves" value="true" />
-        </application>
-
         <!-- OpenGL Game workarounds (zink) -->
         <application name="Black Geyser: Couriers of Darkness" executable="BlackGeyser.x86_64">
             <option name="radv_zero_vram" value="true" />
diff --git a/src/util/driconf.h b/src/util/driconf.h
index ded31db7de9..ca3498da709 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -724,10 +724,6 @@
 #define DRI_CONF_RADV_CLEAR_LDS(def) \
    DRI_CONF_OPT_B(radv_clear_lds, def, "Clear LDS at the end of shaders. Might decrease performance.")
 
-#define DRI_CONF_RADV_FORCE_ACTIVE_ACCEL_STRUCT_LEAVES(def) \
-   DRI_CONF_OPT_B(radv_force_active_accel_struct_leaves, def, \
-                  "Force leaf nodes of acceleration structures to be marked active.")
-
 #define DRI_CONF_RADV_DISABLE_NGG_GS(def) \
    DRI_CONF_OPT_B(radv_disable_ngg_gs, def, "Disable NGG GS on GFX10/GFX10.3.")