feat(tracy): add additional zones

src/Deferred.cpp

@@ -238,18 +238,16 @@ void Deferred::ReflectionsPrepasses()
 	state->UpdateSharedData(false, false);
 
 	ZoneScoped;
-	TracyD3D11Zone(globals::game::graphicsState->tracyCtx, "Early Prepass");
+	TracyD3D11Zone(globals::state->tracyCtx, "Reflections Prepass");
 
 	auto context = globals::d3d::context;
 	context->OMSetRenderTargets(0, nullptr, nullptr);  // Unbind all bound render targets
 
 	globals::game::stateUpdateFlags->set(RE::BSGraphics::ShaderFlags::DIRTY_RENDERTARGET);  // Run OMSetRenderTargets again
 
-	for (auto* feature : Feature::GetFeatureList()) {
-		if (feature->loaded) {
-			feature->ReflectionsPrepass();
-		}
-	}
+	Feature::ForEachLoadedFeature("ReflectionsPrepass", [](Feature* feature) {
+		feature->ReflectionsPrepass();
+	});
 }
 
 void Deferred::EarlyPrepasses()
@@ -262,18 +260,16 @@ void Deferred::EarlyPrepasses()
 	globals::state->UpdateSharedData(false, true);
 
 	ZoneScoped;
-	TracyD3D11Zone(globals::game::graphicsState->tracyCtx, "Early Prepass");
+	TracyD3D11Zone(globals::state->tracyCtx, "Early Prepass");
 
 	auto context = globals::d3d::context;
 	context->OMSetRenderTargets(0, nullptr, nullptr);  // Unbind all bound render targets
 
 	globals::game::stateUpdateFlags->set(RE::BSGraphics::ShaderFlags::DIRTY_RENDERTARGET);  // Run OMSetRenderTargets again
 
-	for (auto* feature : Feature::GetFeatureList()) {
-		if (feature->loaded) {
-			feature->EarlyPrepass();
-		}
-	}
+	Feature::ForEachLoadedFeature("EarlyPrepass", [](Feature* feature) {
+		feature->EarlyPrepass();
+	});
 }
 
 void Deferred::PrepassPasses()
@@ -290,11 +286,9 @@ void Deferred::PrepassPasses()
 	context->OMSetRenderTargets(0, nullptr, nullptr);  // Unbind all bound render targets
 
 	globals::truePBR->PrePass();
-	for (auto* feature : Feature::GetFeatureList()) {
-		if (feature->loaded) {
-			feature->Prepass();
-		}
-	}
+	Feature::ForEachLoadedFeature("Prepass", [](Feature* feature) {
+		feature->Prepass();
+	});
 }
 
 void Deferred::StartDeferred()

src/Feature.h

@@ -1,6 +1,9 @@
 #pragma once
 
 #include "FeatureVersions.h"
+#ifdef TRACY_ENABLE
+#	include <Tracy/Tracy.hpp>
+#endif
 
 struct Feature
 {
@@ -165,4 +168,38 @@ struct Feature
 	 * @return True if the feature is found, false otherwise.
 	 */
 	static bool IsFeatureKnown(const std::string& shortName, REL::Version* outVersion = nullptr);
+
+	/**
+	 * @brief Execute a callable for each loaded feature with optional Tracy CPU profiling
+	 *
+	 * Iterates through all loaded features and calls the provided function with automatic
+	 * CPU profiling zones (ZoneScoped/ZoneText via Tracy) when TRACY_ENABLE is defined.
+	 * Thread-local string formatting is used to minimize per-call overhead.
+	 *
+	 * Usage:
+	 *   Feature::ForEachLoadedFeature("Reset", [](Feature* feature) { feature->Reset(); });
+	 *   Feature::ForEachLoadedFeature("Prepass", [](Feature* feature) { feature->Prepass(); });
+	 *
+	 * @param methodName Name of the method being called (used for Tracy zone naming)
+	 * @param callback Callable that receives (Feature*) and performs the operation
+	 */
+	template <typename Func>
+	static inline void ForEachLoadedFeature(std::string_view methodName, Func&& callback)
+	{
+		for (auto* feature : GetFeatureList()) {
+			if (feature->loaded) {
+#ifdef TRACY_ENABLE
+				{
+					ZoneScoped;
+					static thread_local std::string zoneName;
+					zoneName = std::format("{}::{}", feature->GetShortName(), methodName);
+					ZoneText(zoneName.c_str(), zoneName.size());
+					callback(feature);
+				}
+#else
+				callback(feature);
+#endif
+			}
+		}
+	}
 };

src/Features/ScreenSpaceShadows.cpp

@@ -157,12 +157,8 @@ void ScreenSpaceShadows::DrawShadows()
 	// Shared dispatch logic for both VR and non-VR
 	auto DispatchEye = [&](const char* eyeName, ID3D11ComputeShader* shader, const float* lightProj,
 						   float invTexSizeX, float invTexSizeY) {
-		std::string eventName;
-		const char* tracyName = "SSS - Ray March";
-
 		if (globals::state->frameAnnotations && eyeName) {
-			eventName = std::format("SSS - Ray March ({})", eyeName);
-			tracyName = eventName.c_str();
+			std::string eventName = std::format("SSS - Ray March ({})", eyeName);
 			globals::state->BeginPerfEvent(eventName);
 		} else if (globals::state->frameAnnotations) {
 			globals::state->BeginPerfEvent("SSS - Ray March");
@@ -173,7 +169,7 @@ void ScreenSpaceShadows::DrawShadows()
 		auto dispatchList = Bend::BuildDispatchList(const_cast<float*>(lightProj), viewportSize, minRenderBounds, maxRenderBounds);
 
 		for (int i = 0; i < dispatchList.DispatchCount; i++) {
-			TracyD3D11Zone(globals::state->tracyCtx, tracyName);
+			TracyD3D11Zone(globals::state->tracyCtx, "SSS - Ray March");
 
 			auto dispatchData = dispatchList.Dispatch[i];
 

src/ShaderCache.cpp

@@ -2645,6 +2645,9 @@ namespace SIE
 
 	void ShaderCompilationTask::Perform() const
 	{
+		ZoneScoped;
+		ZoneText(GetString().c_str(), GetString().size());
+
 		if (shaderClass == ShaderClass::Vertex) {
 			ShaderCache::Instance().MakeAndAddVertexShader(shader, descriptor);
 		} else if (shaderClass == ShaderClass::Pixel) {

src/State.cpp

@@ -21,6 +21,8 @@
 
 void State::Draw()
 {
+	ZoneScoped;
+
 	auto shaderCache = globals::shaderCache;
 	auto deferred = globals::deferred;
 	auto& terrainBlending = globals::features::terrainBlending;
@@ -31,19 +33,30 @@ void State::Draw()
 	auto context = globals::d3d::context;
 
 	if (shaderCache->IsEnabled()) {
-		if (weatherEditor.loaded)
+		if (weatherEditor.loaded) {
+			ZoneScopedN("WeatherManager::UpdateFeatures");
 			WeatherManager::GetSingleton()->UpdateFeatures();
+		}
 
-		if (terrainBlending.loaded && terrainBlending.settings.Enabled)
+		if (terrainBlending.loaded && terrainBlending.settings.Enabled) {
+			ZoneScopedN("TerrainBlending::TerrainShaderHacks");
 			terrainBlending.TerrainShaderHacks();
+		}
 
-		if (cloudShadows.loaded)
+		if (cloudShadows.loaded) {
+			ZoneScopedN("CloudShadows::SkyShaderHacks");
 			cloudShadows.SkyShaderHacks();
+		}
 
-		if (terrainHelper.loaded)
+		if (terrainHelper.loaded) {
+			ZoneScopedN("TerrainHelper::SetShaderResouces");
 			terrainHelper.SetShaderResouces(context);
+		}
 
-		truePBR->SetShaderResouces(context);
+		{
+			ZoneScopedN("TruePBR::SetShaderResouces");
+			truePBR->SetShaderResouces(context);
+		}
 
 		if (permutationData != permutationDataPrevious) {
 			permutationCB->Update(permutationData);
@@ -122,9 +135,7 @@ void State::Debug()
 
 void State::Reset()
 {
-	for (auto* feature : Feature::GetFeatureList())
-		if (feature->loaded)
-			feature->Reset();
+	Feature::ForEachLoadedFeature("Reset", [](Feature* feature) { feature->Reset(); });
 	if (!globals::game::ui->GameIsPaused())
 		timer += RE::GetSecondsSinceLastFrame();
 	lastModifiedPixelDescriptor = 0;
@@ -155,9 +166,7 @@ void State::Setup()
 {
 	globals::truePBR->SetupResources();
 	SetupResources();
-	for (auto* feature : Feature::GetFeatureList())
-		if (feature->loaded)
-			feature->SetupResources();
+	Feature::ForEachLoadedFeature("SetupResources", [](Feature* feature) { feature->SetupResources(); });
 	globals::deferred->SetupResources();
 
 	// Load per-weather settings after features are setup

src/XSEPlugin.cpp

@@ -88,11 +88,7 @@ void MessageHandler(SKSE::MessagingInterface::Message* message)
 				auto shaderCache = globals::shaderCache;
 
 				// Run feature PostPostLoad() first so features can disable themselves if needed
-				for (auto* feature : Feature::GetFeatureList()) {
-					if (feature->loaded) {
-						feature->PostPostLoad();
-					}
-				}
+				Feature::ForEachLoadedFeature("PostPostLoad", [](Feature* feature) { feature->PostPostLoad(); });
 
 				// Now validate disk cache after features have had a chance to modify their state
 				shaderCache->ValidateDiskCache();
@@ -126,11 +122,7 @@ void MessageHandler(SKSE::MessagingInterface::Message* message)
 				}
 
 				globals::truePBR->DataLoaded();
-				for (auto* feature : Feature::GetFeatureList()) {
-					if (feature->loaded) {
-						feature->DataLoaded();
-					}
-				}
+				Feature::ForEachLoadedFeature("DataLoaded", [](Feature* feature) { feature->DataLoaded(); });
 			}
 
 			break;
@@ -206,11 +198,7 @@ bool Load()
 	if (errors.empty()) {
 		Hooks::InstallEarlyHooks();
 		logger::info("Calling feature Load methods");
-		for (auto* feature : Feature::GetFeatureList()) {
-			if (feature->loaded) {
-				feature->Load();
-			}
-		}
+		Feature::ForEachLoadedFeature("Load", [](Feature* feature) { feature->Load(); });
 	}
 
 	return true;