From b615c60677968a94c28d8c78a1bbfa09d835ddb6 Mon Sep 17 00:00:00 2001
From: doodlum <15017472+doodlum@users.noreply.github.com>
Date: Mon, 18 May 2026 11:59:32 +0100
Subject: [PATCH] Revert "fix(dynamic cubemap): blend native cubemap fallback
 (#2328)"

This reverts commit 27d3e95e4fe3560e8cf6bdfb82868d7f7f365082.
---
 .../Shaders/DynamicCubemaps/InferCubemapCS.hlsl      |  3 +--
 .../Shaders/Features/DynamicCubemaps.ini             |  2 +-
 package/Shaders/Common/SharedData.hlsli              |  6 +-----
 src/Features/DynamicCubemaps.cpp                     | 12 +-----------
 src/Features/DynamicCubemaps.h                       |  7 -------
 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl b/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl
index 68da4ced86..642336042b 100644
--- a/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl	
+++ b/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl	
@@ -90,8 +90,7 @@ float3 GetSamplingVector(uint3 ThreadID, in RWTexture2DArray<float4> OutputTextu
 	}
 
 #if defined(REFLECTIONS)
-	float fallbackWeight = saturate(mipLevel / 7.0) * SharedData::cubemapCreatorSettings.ReflectionFallbackAmount;
-	color.rgb = lerp(color.rgb, Color::IrradianceToLinear(ReflectionsTexture.SampleLevel(LinearSampler, uv, 0.0).rgb), fallbackWeight);
+	color.rgb = lerp(color.rgb, Color::IrradianceToLinear(ReflectionsTexture.SampleLevel(LinearSampler, uv, 0.0).rgb), saturate(mipLevel / 7.0));
 #else
 	color.rgb = lerp(color.rgb, color.rgb * DefaultCubemap.SampleLevel(LinearSampler, uv, 0.0).xyz, saturate(mipLevel / 7.0));
 #endif
diff --git a/features/Dynamic Cubemaps/Shaders/Features/DynamicCubemaps.ini b/features/Dynamic Cubemaps/Shaders/Features/DynamicCubemaps.ini
index 0edac074f9..82f2c91940 100644
--- a/features/Dynamic Cubemaps/Shaders/Features/DynamicCubemaps.ini	
+++ b/features/Dynamic Cubemaps/Shaders/Features/DynamicCubemaps.ini	
@@ -1,5 +1,5 @@
 [Info]
-Version = 2-3-2
+Version = 2-3-1
 
 [Nexus]
 autoupload = false
diff --git a/package/Shaders/Common/SharedData.hlsli b/package/Shaders/Common/SharedData.hlsli
index c6dae27a6b..8168507571 100644
--- a/package/Shaders/Common/SharedData.hlsli
+++ b/package/Shaders/Common/SharedData.hlsli
@@ -60,13 +60,9 @@ namespace SharedData
 	struct CubemapCreatorSettings
 	{
 		uint Enabled;
-		uint EnabledSSR;
-		float2 pad0;
+		float3 pad0;
 
 		float4 CubemapColor;
-
-		float ReflectionFallbackAmount;
-		float3 pad1;
 	};
 
 	struct TerraOccSettings
diff --git a/src/Features/DynamicCubemaps.cpp b/src/Features/DynamicCubemaps.cpp
index 83fa572f39..560c902452 100644
--- a/src/Features/DynamicCubemaps.cpp
+++ b/src/Features/DynamicCubemaps.cpp
@@ -12,8 +12,7 @@ constexpr auto MIPLEVELS = 8;
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(
 	DynamicCubemaps::Settings,
 	EnabledSSR,
-	EnabledCreator,
-	ReflectionFallbackAmount);
+	EnabledCreator);
 
 std::vector<std::pair<std::string_view, std::string_view>> DynamicCubemaps::GetShaderDefineOptions()
 {
@@ -27,14 +26,6 @@ std::vector<std::pair<std::string_view, std::string_view>> DynamicCubemaps::GetS
 
 void DynamicCubemaps::DrawSettings()
 {
-	if (ImGui::TreeNodeEx("Native Cubemap Fallback", ImGuiTreeNodeFlags_DefaultOpen)) {
-		ImGui::SliderFloat("Fallback Amount", &settings.ReflectionFallbackAmount, kReflectionFallbackMin, kReflectionFallbackMax, "%.2f", ImGuiSliderFlags_AlwaysClamp);
-		if (auto _tt = Util::HoverTooltipWrapper()) {
-			ImGui::Text("Controls how much the game's reflection cubemap fills missing dynamic reflection directions.");
-		}
-		ImGui::TreePop();
-	}
-
 	if (ImGui::TreeNodeEx("Screen Space Reflections", ImGuiTreeNodeFlags_DefaultOpen)) {
 		recompileFlag |= ImGui::Checkbox("Enable Screen Space Reflections", reinterpret_cast<bool*>(&settings.EnabledSSR));
 		if (auto _tt = Util::HoverTooltipWrapper()) {
@@ -140,7 +131,6 @@ void DynamicCubemaps::DrawSettings()
 void DynamicCubemaps::LoadSettings(json& o_json)
 {
 	settings = o_json;
-	settings.ReflectionFallbackAmount = std::clamp(settings.ReflectionFallbackAmount, kReflectionFallbackMin, kReflectionFallbackMax);
 	if (REL::Module::IsVR()) {
 		Util::LoadGameSettings(iniVRCubeMapSettings);
 	}
diff --git a/src/Features/DynamicCubemaps.h b/src/Features/DynamicCubemaps.h
index 413993fcbd..7b23744d41 100644
--- a/src/Features/DynamicCubemaps.h
+++ b/src/Features/DynamicCubemaps.h
@@ -12,10 +12,6 @@ class MenuOpenCloseEventHandler : public RE::BSTEventSink<RE::MenuOpenCloseEvent
 struct DynamicCubemaps : Feature
 {
 public:
-	static constexpr float kReflectionFallbackMin = 0.0f;
-	static constexpr float kReflectionFallbackMax = 1.0f;
-	static constexpr float kReflectionFallbackDefault = 0.5f;
-
 	const std::string defaultDynamicCubeMapSavePath = "Data\\textures\\DynamicCubemaps";
 
 	// Specular irradiance
@@ -120,10 +116,7 @@ struct DynamicCubemaps : Feature
 		uint EnabledSSR = true;
 		uint pad0[2];
 		float4 CubemapColor{ 1.0f, 1.0f, 1.0f, 0.0f };
-		float ReflectionFallbackAmount = kReflectionFallbackDefault;
-		float pad1[3];
 	};
-	STATIC_ASSERT_ALIGNAS_16(Settings);
 
 	Settings settings;
 	bool enabledAtBoot = false;