refactor(pbr): use feature boundary

features/TruePBR/Shaders/Features/TruePBR.ini

@@ -0,0 +1,2 @@
+[Info]
+Version = 1-0-0

src/Deferred.cpp

@@ -4,7 +4,6 @@
 
 #include "ShaderCache.h"
 #include "State.h"
-#include "TruePBR.h"
 #include "Utils/D3D.h"
 
 #include "Features/DynamicCubemaps.h"
@@ -217,7 +216,6 @@ void Deferred::PrepassPasses()
 	auto context = globals::d3d::context;
 	context->OMSetRenderTargets(0, nullptr, nullptr);  // Unbind all bound render targets
 
-	globals::truePBR->PrePass();
 	Feature::ForEachLoadedFeature("Prepass", [](Feature* feature) { feature->Prepass(); }, true);
 }
 
@@ -768,7 +766,4 @@ void Deferred::Hooks::Renderer_ResetState::thunk(void* This)
 	ID3D11Buffer* buffers[3] = { state->permutationCB->CB(), state->sharedDataCB->CB(), state->featureDataCB->CB() };
 	context->PSSetConstantBuffers(4, 3, buffers);
 	context->CSSetConstantBuffers(5, 2, buffers + 1);
-
-	auto* singleton = globals::truePBR;
-	singleton->SetupFrame();
 }

src/Feature.cpp

@@ -43,6 +43,7 @@
 #include "WeatherVariableRegistry.h"
 
 #include "State.h"
+#include "TruePBR.h"
 
 void Feature::Load(json& o_json)
 {
@@ -209,6 +210,7 @@ void Feature::WriteDiskCacheInfo(CSimpleIniA& a_ini)
 const std::vector<Feature*>& Feature::GetFeatureList()
 {
 	static std::vector<Feature*> features = {
+		&globals::features::truePBR,
 		&globals::features::volumetricShadows,
 		&globals::features::grassLighting,
 		&globals::features::grassCollision,

src/Feature.h

@@ -95,6 +95,18 @@ struct Feature
 	virtual void Prepass() {}
 	virtual void EarlyPrepass() {}
 
+	/**
+	 * @brief Called during disk-cache shader loading to generate additional shader permutations.
+	 *
+	 * Invoked once per BSShader load when the shader cache is in disk-cache mode.
+	 * Features can override this to inject custom permutation descriptors into the
+	 * shader cache so that feature-specific technique variants are compiled and stored.
+	 * This is a cold path (disk I/O, not per-frame); performance is not critical here.
+	 *
+	 * @param shader The BSShader being loaded.
+	 */
+	virtual void GenerateShaderPermutations(RE::BSShader*) {}
+
 	virtual void Load() {}  // Called during SKSE Load - earliest hook point only for critical hooks like d3d
 	virtual void DataLoaded() {}
 	virtual void PostPostLoad() {}

src/FeatureBuffer.cpp

@@ -17,8 +17,6 @@
 #include "Features/TerrainVariation.h"
 #include "Features/WetnessEffects.h"
 
-#include "TruePBR.h"
-
 template <class... Ts>
 std::pair<unsigned char*, size_t> _GetFeatureBufferData(Ts... feat_datas)
 {

src/Features/TerrainHelper.cpp

@@ -1,5 +1,6 @@
 #include "TerrainHelper.h"
 
+#include "Globals.h"
 #include "ShaderCache.h"
 #include "State.h"
 
@@ -191,4 +192,46 @@ void TerrainHelper::BSLightingShader_SetupMaterial(RE::BSLightingShaderMaterialB
 			state->permutationData.ExtraFeatureDescriptor &= ~(1 << textureI);
 		}
 	}
+}
+
+struct TH_TESObjectLAND_SetupMaterial
+{
+	static bool thunk(RE::TESObjectLAND* land)
+	{
+		bool result = func(land);
+
+		// TruePBR sets flag 8 on land cells it processes as PBR; skip TerrainHelper for those.
+		if (!land->data.flags.any(static_cast<RE::OBJ_LAND::Flag>(8))) {
+			auto& terrainHelper = globals::features::terrainHelper;
+			if (result && terrainHelper.loaded) {
+				terrainHelper.TESObjectLAND_SetupMaterial(land);
+			}
+		}
+
+		return result;
+	}
+	static inline REL::Relocation<decltype(thunk)> func;
+};
+
+struct TH_BSLightingShader_SetupMaterial
+{
+	static void thunk(RE::BSLightingShader* shader, RE::BSLightingShaderMaterialBase const* material)
+	{
+		func(shader, material);
+
+		auto& terrainHelper = globals::features::terrainHelper;
+		if (terrainHelper.loaded) {
+			terrainHelper.BSLightingShader_SetupMaterial(material);
+		}
+	}
+	static inline REL::Relocation<decltype(thunk)> func;
+};
+
+void TerrainHelper::PostPostLoad()
+{
+	logger::info("[Terrain Helper] Hooking TESObjectLAND");
+	stl::detour_thunk<TH_TESObjectLAND_SetupMaterial>(REL::RelocationID(18368, 18791));
+
+	logger::info("[Terrain Helper] Hooking BSLightingShader::SetupMaterial");
+	stl::write_vfunc<0x4, TH_BSLightingShader_SetupMaterial>(RE::VTABLE_BSLightingShader[0]);
 }

src/Features/TerrainHelper.h

@@ -38,6 +38,7 @@ struct TerrainHelper : Feature
 	bool enabled = false;
 
 	virtual void DataLoaded() override;
+	virtual void PostPostLoad() override;
 	virtual bool SupportsVR() override { return true; };
 	virtual std::string GetFeatureModLink() override { return MakeNexusModURL(MOD_ID); }
 

src/Globals.cpp

@@ -86,6 +86,7 @@ namespace globals
 		RenderDoc renderDoc{};
 		WeatherEditor weatherEditor{};
 		ExponentialHeightFog exponentialHeightFog{};
+		TruePBR truePBR{};
 
 		namespace llf
 		{
@@ -144,7 +145,6 @@ namespace globals
 
 	State* state = nullptr;
 	Deferred* deferred = nullptr;
-	TruePBR* truePBR = nullptr;
 	Menu* menu = nullptr;
 	SIE::ShaderCache* shaderCache = nullptr;
 
@@ -154,7 +154,6 @@ namespace globals
 		state = State::GetSingleton();
 		menu = Menu::GetSingleton();
 		deferred = Deferred::GetSingleton();
-		truePBR = TruePBR::GetSingleton();
 	}
 
 	void ReInit()

src/Globals.h

@@ -93,6 +93,7 @@ namespace globals
 		extern RenderDoc renderDoc;
 		extern WeatherEditor weatherEditor;
 		extern ExponentialHeightFog exponentialHeightFog;
+		extern TruePBR truePBR;
 
 		namespace llf
 		{
@@ -257,7 +258,6 @@ namespace globals
 
 	extern State* state;
 	extern Deferred* deferred;
-	extern TruePBR* truePBR;
 	extern Menu* menu;
 	extern SIE::ShaderCache* shaderCache;
 

src/Hooks.cpp

@@ -7,13 +7,11 @@
 #include "Menu.h"
 #include "ShaderCache.h"
 #include "State.h"
-#include "TruePBR.h"
 #include "Util.h"
 
 #include "Features/HDRDisplay.h"
 #include "Features/InteriorSun.h"
 #include "Features/LightLimitFix.h"
-#include "Features/TerrainHelper.h"
 #include "Features/Upscaling.h"
 #include "Features/VR.h"
 #include "Features/VolumetricLighting.h"
@@ -77,11 +75,11 @@ struct BSShader_LoadShaders
 
 		auto state = globals::state;
 		auto shaderCache = globals::shaderCache;
-		auto truePBR = globals::truePBR;
-
 		if (shaderCache->IsDiskCache() || shaderCache->IsDump()) {
 			if (shaderCache->IsDiskCache()) {
-				truePBR->GenerateShaderPermutations(shader);
+				Feature::ForEachLoadedFeature("GenerateShaderPermutations", [shader](Feature* feature) {
+					feature->GenerateShaderPermutations(shader);
+				});
 			}
 
 			for (const auto& entry : shader->vertexShaders) {
@@ -758,53 +756,6 @@ namespace Hooks
 		static inline REL::Relocation<decltype(thunk)> func;
 	};
 
-	struct TESObjectLAND_SetupMaterial
-	{
-		static bool thunk(RE::TESObjectLAND* land)
-		{
-			bool vanillaResult = func(land);
-
-			// setup material for PBR
-			auto TruePBRSingleton = globals::truePBR;
-			if (TruePBRSingleton->TESObjectLAND_SetupMaterial(land)) {
-				// if PBR, we are done
-				return true;
-			}
-
-			// setup material for terrain helper
-			auto& terrainHelper = globals::features::terrainHelper;
-			if (vanillaResult && terrainHelper.loaded) {
-				terrainHelper.TESObjectLAND_SetupMaterial(land);
-			}
-
-			return vanillaResult;
-		}
-		static inline REL::Relocation<decltype(thunk)> func;
-	};
-
-	struct BSLightingShader_SetupMaterial
-	{
-		static void thunk(RE::BSLightingShader* shader, RE::BSLightingShaderMaterialBase const* material)
-		{
-			// setup material for PBR
-			auto TruePBRSingleton = globals::truePBR;
-			if (TruePBRSingleton->BSLightingShader_SetupMaterial(shader, material)) {
-				// if PBR, we are done
-				return;
-			}
-
-			// vanilla
-			func(shader, material);
-
-			// terrain helper
-			auto& terrainHelper = globals::features::terrainHelper;
-			if (terrainHelper.loaded) {
-				terrainHelper.BSLightingShader_SetupMaterial(material);
-			}
-		};
-		static inline REL::Relocation<decltype(thunk)> func;
-	};
-
 #ifdef TRACY_ENABLE
 	struct Main_Update
 	{
@@ -1010,12 +961,6 @@ namespace Hooks
 		stl::write_thunk_call<GrassExtensions::BSGrassShaderProperty_ctor>(REL::RelocationID(15214, 15383).address() + REL::Relocate(0x45B, 0x4F5));
 		stl::write_vfunc<0x6, GrassExtensions::BSGrassShader_SetupGeometry>(RE::VTABLE_BSGrassShader[0]);
 
-		logger::info("Hooking TESObjectLAND");
-		stl::detour_thunk<TESObjectLAND_SetupMaterial>(REL::RelocationID(18368, 18791));
-
-		logger::info("Hooking BSLightingShader");
-		stl::write_vfunc<0x4, BSLightingShader_SetupMaterial>(RE::VTABLE_BSLightingShader[0]);
-
 		// Patch render space in BSLightingShader::SetupGeometry to always use world space
 		// The variable updateEyePosition is set to 1 when not skinned. By patching to be 0 it will always use world space
 		// We offset from the base address of the containing function to the start of the patch

src/Menu.cpp

@@ -35,7 +35,6 @@
 #include "Menu/ThemeManager.h"
 #include "ShaderCache.h"
 #include "State.h"
-#include "TruePBR.h"
 #include "Util.h"
 #include "Utils/UI.h"
 
@@ -771,9 +770,7 @@ void Menu::DrawGeneralSettings()
  */
 void Menu::DrawAdvancedSettings()
 {
-	// Render advanced settings using extracted component
 	AdvancedSettingsRenderer::RenderAdvancedSettings(
-		[this]() { globals::truePBR->DrawSettings(); },
 		[this]() { DrawDisableAtBootSettings(); });
 }
 
@@ -789,27 +786,6 @@ void Menu::DrawDisableAtBootSettings()
 
 	ImGui::Spacing();
 
-	if (ImGui::CollapsingHeader("Special Features", ImGuiTreeNodeFlags_DefaultOpen)) {
-		// Prepare a sorted list of special feature names
-		std::vector<std::string> specialFeatureNames;
-		for (const auto& [featureName, _] : state->specialFeatures) {
-			specialFeatureNames.push_back(featureName);
-		}
-		std::sort(specialFeatureNames.begin(), specialFeatureNames.end());
-
-		// Display sorted special features
-		for (const auto& featureName : specialFeatureNames) {
-			// Check if the feature is currently disabled
-			bool isDisabled = disabledFeatures.contains(featureName) && disabledFeatures[featureName];
-
-			// Create a checkbox for each feature
-			if (ImGui::Checkbox(featureName.c_str(), &isDisabled)) {
-				// Update the disabledFeatures map based on user interaction
-				disabledFeatures[featureName] = isDisabled;
-			}
-		}
-	}
-
 	if (ImGui::CollapsingHeader("Features", ImGuiTreeNodeFlags_DefaultOpen)) {
 		// Prepare a sorted list of feature pointers
 		auto featureList = Feature::GetFeatureList();

src/Menu/AdvancedSettingsRenderer.cpp

@@ -13,13 +13,11 @@
 #include "Menu.h"
 #include "ShaderCache.h"
 #include "State.h"
-#include "TruePBR.h"
 #include "Util.h"
 #include "Utils/Format.h"
 #include "Utils/UI.h"
 
 void AdvancedSettingsRenderer::RenderAdvancedSettings(
-	const std::function<void()>& drawTruePBRSettings,
 	const std::function<void()>& drawDisableAtBootSettings)
 {
 	// Use TabBar system - tabs sorted alphabetically
@@ -51,14 +49,6 @@ void AdvancedSettingsRenderer::RenderAdvancedSettings(
 			ImGui::EndTabItem();
 		}
 
-		// PBR Settings Tab
-		if (MenuFonts::BeginTabItemWithFont("PBR Settings", Menu::FontRole::Subheading)) {
-			if (ImGui::BeginChild("##PBRSettingsContent", ImVec2(0, 0), false)) {
-				RenderPBRSection(drawTruePBRSettings);
-			}
-			ImGui::EndChild();
-			ImGui::EndTabItem();
-		}
 		// Shader Debug Tab
 		if (MenuFonts::BeginTabItemWithFont("Shader Debug", Menu::FontRole::Subheading)) {
 			if (ImGui::BeginChild("##ShaderDebugContent", ImVec2(0, 0), false)) {
@@ -514,11 +504,6 @@ void AdvancedSettingsRenderer::RenderShaderDebugSection()
 	}
 }
 
-void AdvancedSettingsRenderer::RenderPBRSection(const std::function<void()>& drawTruePBRSettings)
-{
-	drawTruePBRSettings();
-}
-
 void AdvancedSettingsRenderer::RenderDisableAtBootSection(const std::function<void()>& drawDisableAtBootSettings)
 {
 	drawDisableAtBootSettings();

src/Menu/AdvancedSettingsRenderer.h

@@ -10,13 +10,11 @@ class AdvancedSettingsRenderer
 {
 public:
 	static void RenderAdvancedSettings(
-		const std::function<void()>& drawTruePBRSettings,
 		const std::function<void()>& drawDisableAtBootSettings);
 
 private:
 	static void RenderLoggingSection();
 	static void RenderShaderDebugSection();
-	static void RenderPBRSection(const std::function<void()>& drawTruePBRSettings);
 	static void RenderDisableAtBootSection(const std::function<void()>& drawDisableAtBootSettings);
 	static void RenderDeveloperSection();
 	static void RenderTestingSection();