Phase 1 clean-up and separation of concerns

2026-05-10 23:21:13 +10:00
parent 3629227aa9
commit 739231d5a1
24 changed files with 1043 additions and 449 deletions
--- a/apps/LoopThroughWithOpenGLCompositing/runtime/HealthTelemetry.cpp
+++ b/apps/LoopThroughWithOpenGLCompositing/runtime/HealthTelemetry.cpp
@@ -0,0 +1,43 @@
+#include "stdafx.h"
+#include "HealthTelemetry.h"
+
+#include "RuntimeHost.h"
+
+HealthTelemetry::HealthTelemetry(RuntimeHost& runtimeHost) :
+	mRuntimeHost(runtimeHost)
+{
+}
+
+void HealthTelemetry::ReportSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName)
+{
+	mRuntimeHost.WriteSignalStatus(hasSignal, width, height, modeName);
+}
+
+bool HealthTelemetry::TryReportSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName)
+{
+	return mRuntimeHost.TryWriteSignalStatus(hasSignal, width, height, modeName);
+}
+
+void HealthTelemetry::RecordPerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds)
+{
+	mRuntimeHost.WritePerformanceStats(frameBudgetMilliseconds, renderMilliseconds);
+}
+
+bool HealthTelemetry::TryRecordPerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds)
+{
+	return mRuntimeHost.TryWritePerformanceStats(frameBudgetMilliseconds, renderMilliseconds);
+}
+
+void HealthTelemetry::RecordFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
+	double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount)
+{
+	mRuntimeHost.WriteFramePacingStats(completionIntervalMilliseconds, smoothedCompletionIntervalMilliseconds,
+		maxCompletionIntervalMilliseconds, lateFrameCount, droppedFrameCount, flushedFrameCount);
+}
+
+bool HealthTelemetry::TryRecordFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
+	double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount)
+{
+	return mRuntimeHost.TryWriteFramePacingStats(completionIntervalMilliseconds, smoothedCompletionIntervalMilliseconds,
+		maxCompletionIntervalMilliseconds, lateFrameCount, droppedFrameCount, flushedFrameCount);
+}
--- a/apps/LoopThroughWithOpenGLCompositing/runtime/HealthTelemetry.h
+++ b/apps/LoopThroughWithOpenGLCompositing/runtime/HealthTelemetry.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+class RuntimeHost;
+
+// Phase 1 compatibility seam for status and timing reporting. The current
+// implementation still writes through RuntimeHost, but callers can now target
+// HealthTelemetry as the home for operational visibility work.
+class HealthTelemetry
+{
+public:
+	explicit HealthTelemetry(RuntimeHost& runtimeHost);
+
+	void ReportSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName);
+	bool TryReportSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName);
+
+	void RecordPerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds);
+	bool TryRecordPerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds);
+
+	void RecordFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
+		double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount);
+	bool TryRecordFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
+		double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount);
+
+private:
+	RuntimeHost& mRuntimeHost;
+};
--- a/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeHost.cpp
+++ b/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeHost.cpp
@@ -699,7 +699,8 @@ bool ParseParameterDefinitions(const JsonValue& manifestJson, ShaderPackage& sha
 }

 RuntimeHost::RuntimeHost()
-	: mReloadRequested(false),
+	: mHealthTelemetry(*this),
+	mReloadRequested(false),
 	mCompileSucceeded(false),
 	mHasSignal(false),
 	mSignalWidth(0),
@@ -1351,12 +1352,22 @@ void RuntimeHost::SetCompileStatus(bool succeeded, const std::string& message)
 }

 void RuntimeHost::SetSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName)
+{
+	mHealthTelemetry.ReportSignalStatus(hasSignal, width, height, modeName);
+}
+
+bool RuntimeHost::TrySetSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName)
+{
+	return mHealthTelemetry.TryReportSignalStatus(hasSignal, width, height, modeName);
+}
+
+void RuntimeHost::WriteSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
 	SetSignalStatusLocked(hasSignal, width, height, modeName);
 }

-bool RuntimeHost::TrySetSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName)
+bool RuntimeHost::TryWriteSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName)
 {
 	std::unique_lock<std::mutex> lock(mMutex, std::try_to_lock);
 	if (!lock.owns_lock())
@@ -1413,12 +1424,22 @@ void RuntimeHost::SetVideoIOStatus(const std::string& backendName, const std::st
 }

 void RuntimeHost::SetPerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds)
+{
+	mHealthTelemetry.RecordPerformanceStats(frameBudgetMilliseconds, renderMilliseconds);
+}
+
+bool RuntimeHost::TrySetPerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds)
+{
+	return mHealthTelemetry.TryRecordPerformanceStats(frameBudgetMilliseconds, renderMilliseconds);
+}
+
+void RuntimeHost::WritePerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
 	SetPerformanceStatsLocked(frameBudgetMilliseconds, renderMilliseconds);
 }

-bool RuntimeHost::TrySetPerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds)
+bool RuntimeHost::TryWritePerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds)
 {
 	std::unique_lock<std::mutex> lock(mMutex, std::try_to_lock);
 	if (!lock.owns_lock())
@@ -1440,13 +1461,27 @@ void RuntimeHost::SetPerformanceStatsLocked(double frameBudgetMilliseconds, doub

 void RuntimeHost::SetFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
 	double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount)
+{
+	mHealthTelemetry.RecordFramePacingStats(completionIntervalMilliseconds, smoothedCompletionIntervalMilliseconds,
+		maxCompletionIntervalMilliseconds, lateFrameCount, droppedFrameCount, flushedFrameCount);
+}
+
+bool RuntimeHost::TrySetFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
+	double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount)
+{
+	return mHealthTelemetry.TryRecordFramePacingStats(completionIntervalMilliseconds, smoothedCompletionIntervalMilliseconds,
+		maxCompletionIntervalMilliseconds, lateFrameCount, droppedFrameCount, flushedFrameCount);
+}
+
+void RuntimeHost::WriteFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
+	double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount)
 {
 	std::lock_guard<std::mutex> lock(mMutex);
 	SetFramePacingStatsLocked(completionIntervalMilliseconds, smoothedCompletionIntervalMilliseconds,
 		maxCompletionIntervalMilliseconds, lateFrameCount, droppedFrameCount, flushedFrameCount);
 }

-bool RuntimeHost::TrySetFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
+bool RuntimeHost::TryWriteFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
 	double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount)
 {
 	std::unique_lock<std::mutex> lock(mMutex, std::try_to_lock);
--- a/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeHost.h
+++ b/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeHost.h
@@ -1,5 +1,6 @@
 #pragma once

+#include "HealthTelemetry.h"
 #include "RuntimeJson.h"
 #include "ShaderTypes.h"

@@ -52,6 +53,8 @@ public:
 		double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount);
 	void AdvanceFrame();
 	bool TryAdvanceFrame();
+	HealthTelemetry& GetHealthTelemetry() { return mHealthTelemetry; }
+	const HealthTelemetry& GetHealthTelemetry() const { return mHealthTelemetry; }

 	bool BuildLayerPassFragmentShaderSources(const std::string& layerId, std::vector<ShaderPassBuildSource>& passSources, std::string& error);
 	std::vector<RuntimeRenderState> GetLayerRenderStates(unsigned outputWidth, unsigned outputHeight) const;
@@ -145,14 +148,24 @@ private:
 	LayerPersistentState* FindLayerById(const std::string& layerId);
 	const LayerPersistentState* FindLayerById(const std::string& layerId) const;
 	std::string GenerateLayerId();
+	void WriteSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName);
+	bool TryWriteSignalStatus(bool hasSignal, unsigned width, unsigned height, const std::string& modeName);
 	void SetSignalStatusLocked(bool hasSignal, unsigned width, unsigned height, const std::string& modeName);
 	void MarkRenderStateDirtyLocked();
 	void MarkParameterStateDirtyLocked();
+	void WritePerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds);
+	bool TryWritePerformanceStats(double frameBudgetMilliseconds, double renderMilliseconds);
 	void SetPerformanceStatsLocked(double frameBudgetMilliseconds, double renderMilliseconds);
+	void WriteFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
+		double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount);
+	bool TryWriteFramePacingStats(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
+		double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount);
 	void SetFramePacingStatsLocked(double completionIntervalMilliseconds, double smoothedCompletionIntervalMilliseconds,
 		double maxCompletionIntervalMilliseconds, uint64_t lateFrameCount, uint64_t droppedFrameCount, uint64_t flushedFrameCount);

 private:
+	friend class HealthTelemetry;
+	HealthTelemetry mHealthTelemetry;
 	mutable std::mutex mMutex;
 	AppConfig mConfig;
 	PersistentState mPersistentState;
--- a/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeSnapshotProvider.cpp
+++ b/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeSnapshotProvider.cpp
@@ -1,5 +1,7 @@
 #include "RuntimeSnapshotProvider.h"

+#include <utility>
+
 RuntimeSnapshotProvider::RuntimeSnapshotProvider(RuntimeHost& runtimeHost) :
 	mRuntimeHost(runtimeHost)
 {
@@ -10,32 +12,142 @@ bool RuntimeSnapshotProvider::BuildLayerPassFragmentShaderSources(const std::str
 	return mRuntimeHost.BuildLayerPassFragmentShaderSources(layerId, passSources, error);
 }

+RuntimeSnapshotVersions RuntimeSnapshotProvider::GetVersions() const
+{
+	RuntimeSnapshotVersions versions;
+	versions.renderStateVersion = mRuntimeHost.GetRenderStateVersion();
+	versions.parameterStateVersion = mRuntimeHost.GetParameterStateVersion();
+	return versions;
+}
+
+RuntimeRenderFrameContext RuntimeSnapshotProvider::GetFrameContext() const
+{
+	std::vector<RuntimeRenderState> stateScratch(1);
+	mRuntimeHost.RefreshDynamicRenderStateFields(stateScratch);
+
+	RuntimeRenderFrameContext frameContext;
+	const RuntimeRenderState& state = stateScratch.front();
+	frameContext.timeSeconds = state.timeSeconds;
+	frameContext.utcTimeSeconds = state.utcTimeSeconds;
+	frameContext.utcOffsetSeconds = state.utcOffsetSeconds;
+	frameContext.startupRandom = state.startupRandom;
+	frameContext.frameCount = state.frameCount;
+	return frameContext;
+}
+
+RuntimeRenderStateSnapshot RuntimeSnapshotProvider::GetRenderStateSnapshot(unsigned outputWidth, unsigned outputHeight) const
+{
+	for (;;)
+	{
+		const RuntimeSnapshotVersions versionsBefore = GetVersions();
+
+		RuntimeRenderStateSnapshot snapshot;
+		snapshot.outputWidth = outputWidth;
+		snapshot.outputHeight = outputHeight;
+		snapshot.states = mRuntimeHost.GetLayerRenderStates(outputWidth, outputHeight);
+
+		const RuntimeSnapshotVersions versionsAfter = GetVersions();
+		if (versionsBefore.renderStateVersion == versionsAfter.renderStateVersion &&
+			versionsBefore.parameterStateVersion == versionsAfter.parameterStateVersion)
+		{
+			snapshot.versions = versionsAfter;
+			return snapshot;
+		}
+	}
+}
+
+bool RuntimeSnapshotProvider::TryGetRenderStateSnapshot(unsigned outputWidth, unsigned outputHeight, RuntimeRenderStateSnapshot& snapshot) const
+{
+	const RuntimeSnapshotVersions versionsBefore = GetVersions();
+
+	std::vector<RuntimeRenderState> states;
+	if (!mRuntimeHost.TryGetLayerRenderStates(outputWidth, outputHeight, states))
+		return false;
+
+	const RuntimeSnapshotVersions versionsAfter = GetVersions();
+	if (versionsBefore.renderStateVersion != versionsAfter.renderStateVersion ||
+		versionsBefore.parameterStateVersion != versionsAfter.parameterStateVersion)
+	{
+		return false;
+	}
+
+	snapshot.outputWidth = outputWidth;
+	snapshot.outputHeight = outputHeight;
+	snapshot.versions = versionsAfter;
+	snapshot.states = std::move(states);
+	return true;
+}
+
+bool RuntimeSnapshotProvider::TryRefreshSnapshotParameters(RuntimeRenderStateSnapshot& snapshot) const
+{
+	const uint64_t expectedRenderStateVersion = snapshot.versions.renderStateVersion;
+	if (!mRuntimeHost.TryRefreshCachedLayerStates(snapshot.states))
+		return false;
+
+	const RuntimeSnapshotVersions versions = GetVersions();
+	if (versions.renderStateVersion != expectedRenderStateVersion)
+		return false;
+
+	snapshot.versions = versions;
+	return true;
+}
+
+void RuntimeSnapshotProvider::ApplyFrameContext(std::vector<RuntimeRenderState>& states, const RuntimeRenderFrameContext& frameContext) const
+{
+	for (RuntimeRenderState& state : states)
+	{
+		state.timeSeconds = frameContext.timeSeconds;
+		state.utcTimeSeconds = frameContext.utcTimeSeconds;
+		state.utcOffsetSeconds = frameContext.utcOffsetSeconds;
+		state.startupRandom = frameContext.startupRandom;
+		state.frameCount = frameContext.frameCount;
+	}
+}
+
+void RuntimeSnapshotProvider::ApplyFrameContext(RuntimeRenderStateSnapshot& snapshot, const RuntimeRenderFrameContext& frameContext) const
+{
+	ApplyFrameContext(snapshot.states, frameContext);
+}
+
 std::vector<RuntimeRenderState> RuntimeSnapshotProvider::GetLayerRenderStates(unsigned outputWidth, unsigned outputHeight) const
 {
-	return mRuntimeHost.GetLayerRenderStates(outputWidth, outputHeight);
+	return GetRenderStateSnapshot(outputWidth, outputHeight).states;
 }

 bool RuntimeSnapshotProvider::TryGetLayerRenderStates(unsigned outputWidth, unsigned outputHeight, std::vector<RuntimeRenderState>& states) const
 {
-	return mRuntimeHost.TryGetLayerRenderStates(outputWidth, outputHeight, states);
+	RuntimeRenderStateSnapshot snapshot;
+	if (!TryGetRenderStateSnapshot(outputWidth, outputHeight, snapshot))
+		return false;
+
+	states = std::move(snapshot.states);
+	return true;
 }

 bool RuntimeSnapshotProvider::TryRefreshCachedLayerStates(std::vector<RuntimeRenderState>& states) const
 {
-	return mRuntimeHost.TryRefreshCachedLayerStates(states);
+	RuntimeRenderStateSnapshot snapshot;
+	snapshot.versions.renderStateVersion = mRuntimeHost.GetRenderStateVersion();
+	snapshot.versions.parameterStateVersion = mRuntimeHost.GetParameterStateVersion();
+	snapshot.states = states;
+	if (!TryRefreshSnapshotParameters(snapshot))
+		return false;
+
+	states = std::move(snapshot.states);
+	return true;
 }

 void RuntimeSnapshotProvider::RefreshDynamicRenderStateFields(std::vector<RuntimeRenderState>& states) const
 {
-	mRuntimeHost.RefreshDynamicRenderStateFields(states);
+	ApplyFrameContext(states, GetFrameContext());
 }

 uint64_t RuntimeSnapshotProvider::GetRenderStateVersion() const
 {
-	return mRuntimeHost.GetRenderStateVersion();
+	return GetVersions().renderStateVersion;
 }

 uint64_t RuntimeSnapshotProvider::GetParameterStateVersion() const
 {
-	return mRuntimeHost.GetParameterStateVersion();
+	return GetVersions().parameterStateVersion;
 }
--- a/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeSnapshotProvider.h
+++ b/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeSnapshotProvider.h
@@ -6,12 +6,43 @@
 #include <string>
 #include <vector>

+struct RuntimeSnapshotVersions
+{
+	uint64_t renderStateVersion = 0;
+	uint64_t parameterStateVersion = 0;
+};
+
+struct RuntimeRenderFrameContext
+{
+	double timeSeconds = 0.0;
+	double utcTimeSeconds = 0.0;
+	double utcOffsetSeconds = 0.0;
+	double startupRandom = 0.0;
+	double frameCount = 0.0;
+};
+
+struct RuntimeRenderStateSnapshot
+{
+	RuntimeSnapshotVersions versions;
+	unsigned outputWidth = 0;
+	unsigned outputHeight = 0;
+	std::vector<RuntimeRenderState> states;
+};
+
 class RuntimeSnapshotProvider
 {
 public:
 	explicit RuntimeSnapshotProvider(RuntimeHost& runtimeHost);

 	bool BuildLayerPassFragmentShaderSources(const std::string& layerId, std::vector<ShaderPassBuildSource>& passSources, std::string& error) const;
+	RuntimeSnapshotVersions GetVersions() const;
+	RuntimeRenderFrameContext GetFrameContext() const;
+	RuntimeRenderStateSnapshot GetRenderStateSnapshot(unsigned outputWidth, unsigned outputHeight) const;
+	bool TryGetRenderStateSnapshot(unsigned outputWidth, unsigned outputHeight, RuntimeRenderStateSnapshot& snapshot) const;
+	bool TryRefreshSnapshotParameters(RuntimeRenderStateSnapshot& snapshot) const;
+	void ApplyFrameContext(std::vector<RuntimeRenderState>& states, const RuntimeRenderFrameContext& frameContext) const;
+	void ApplyFrameContext(RuntimeRenderStateSnapshot& snapshot, const RuntimeRenderFrameContext& frameContext) const;
+
 	std::vector<RuntimeRenderState> GetLayerRenderStates(unsigned outputWidth, unsigned outputHeight) const;
 	bool TryGetLayerRenderStates(unsigned outputWidth, unsigned outputHeight, std::vector<RuntimeRenderState>& states) const;
 	bool TryRefreshCachedLayerStates(std::vector<RuntimeRenderState>& states) const;
--- a/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeStore.cpp
+++ b/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeStore.cpp
@@ -5,147 +5,147 @@ RuntimeStore::RuntimeStore(RuntimeHost& runtimeHost) :
 {
 }

-bool RuntimeStore::Initialize(std::string& error)
+bool RuntimeStore::InitializeStore(std::string& error)
 {
 	return mRuntimeHost.Initialize(error);
 }

-bool RuntimeStore::AddLayer(const std::string& shaderId, std::string& error)
-{
-	return mRuntimeHost.AddLayer(shaderId, error);
-}
-
-bool RuntimeStore::RemoveLayer(const std::string& layerId, std::string& error)
-{
-	return mRuntimeHost.RemoveLayer(layerId, error);
-}
-
-bool RuntimeStore::MoveLayer(const std::string& layerId, int direction, std::string& error)
-{
-	return mRuntimeHost.MoveLayer(layerId, direction, error);
-}
-
-bool RuntimeStore::MoveLayerToIndex(const std::string& layerId, std::size_t targetIndex, std::string& error)
-{
-	return mRuntimeHost.MoveLayerToIndex(layerId, targetIndex, error);
-}
-
-bool RuntimeStore::SetLayerBypass(const std::string& layerId, bool bypassed, std::string& error)
-{
-	return mRuntimeHost.SetLayerBypass(layerId, bypassed, error);
-}
-
-bool RuntimeStore::SetLayerShader(const std::string& layerId, const std::string& shaderId, std::string& error)
-{
-	return mRuntimeHost.SetLayerShader(layerId, shaderId, error);
-}
-
-bool RuntimeStore::UpdateLayerParameter(const std::string& layerId, const std::string& parameterId, const JsonValue& newValue, std::string& error)
-{
-	return mRuntimeHost.UpdateLayerParameter(layerId, parameterId, newValue, error);
-}
-
-bool RuntimeStore::UpdateLayerParameterByControlKey(const std::string& layerKey, const std::string& parameterKey, const JsonValue& newValue, std::string& error)
-{
-	return mRuntimeHost.UpdateLayerParameterByControlKey(layerKey, parameterKey, newValue, error);
-}
-
-bool RuntimeStore::UpdateLayerParameterByControlKey(const std::string& layerKey, const std::string& parameterKey, const JsonValue& newValue, bool persistState, std::string& error)
-{
-	return mRuntimeHost.UpdateLayerParameterByControlKey(layerKey, parameterKey, newValue, persistState, error);
-}
-
-bool RuntimeStore::ResetLayerParameters(const std::string& layerId, std::string& error)
-{
-	return mRuntimeHost.ResetLayerParameters(layerId, error);
-}
-
-bool RuntimeStore::SaveStackPreset(const std::string& presetName, std::string& error) const
-{
-	return mRuntimeHost.SaveStackPreset(presetName, error);
-}
-
-bool RuntimeStore::LoadStackPreset(const std::string& presetName, std::string& error)
-{
-	return mRuntimeHost.LoadStackPreset(presetName, error);
-}
-
-std::string RuntimeStore::BuildStateJson() const
+std::string RuntimeStore::BuildPersistentStateJson() const
 {
 	return mRuntimeHost.BuildStateJson();
 }

-const std::filesystem::path& RuntimeStore::GetRepoRoot() const
+bool RuntimeStore::CreateStoredLayer(const std::string& shaderId, std::string& error)
+{
+	return mRuntimeHost.AddLayer(shaderId, error);
+}
+
+bool RuntimeStore::DeleteStoredLayer(const std::string& layerId, std::string& error)
+{
+	return mRuntimeHost.RemoveLayer(layerId, error);
+}
+
+bool RuntimeStore::MoveStoredLayer(const std::string& layerId, int direction, std::string& error)
+{
+	return mRuntimeHost.MoveLayer(layerId, direction, error);
+}
+
+bool RuntimeStore::MoveStoredLayerToIndex(const std::string& layerId, std::size_t targetIndex, std::string& error)
+{
+	return mRuntimeHost.MoveLayerToIndex(layerId, targetIndex, error);
+}
+
+bool RuntimeStore::SetStoredLayerBypassState(const std::string& layerId, bool bypassed, std::string& error)
+{
+	return mRuntimeHost.SetLayerBypass(layerId, bypassed, error);
+}
+
+bool RuntimeStore::SetStoredLayerShaderSelection(const std::string& layerId, const std::string& shaderId, std::string& error)
+{
+	return mRuntimeHost.SetLayerShader(layerId, shaderId, error);
+}
+
+bool RuntimeStore::SetStoredParameterValue(const std::string& layerId, const std::string& parameterId, const JsonValue& newValue, std::string& error)
+{
+	return mRuntimeHost.UpdateLayerParameter(layerId, parameterId, newValue, error);
+}
+
+bool RuntimeStore::SetStoredParameterValueByControlKey(const std::string& layerKey, const std::string& parameterKey, const JsonValue& newValue, std::string& error)
+{
+	return mRuntimeHost.UpdateLayerParameterByControlKey(layerKey, parameterKey, newValue, error);
+}
+
+bool RuntimeStore::SetStoredParameterValueByControlKey(const std::string& layerKey, const std::string& parameterKey, const JsonValue& newValue, bool persistState, std::string& error)
+{
+	return mRuntimeHost.UpdateLayerParameterByControlKey(layerKey, parameterKey, newValue, persistState, error);
+}
+
+bool RuntimeStore::ResetStoredLayerParameterValues(const std::string& layerId, std::string& error)
+{
+	return mRuntimeHost.ResetLayerParameters(layerId, error);
+}
+
+bool RuntimeStore::SaveStackPresetSnapshot(const std::string& presetName, std::string& error) const
+{
+	return mRuntimeHost.SaveStackPreset(presetName, error);
+}
+
+bool RuntimeStore::LoadStackPresetSnapshot(const std::string& presetName, std::string& error)
+{
+	return mRuntimeHost.LoadStackPreset(presetName, error);
+}
+
+const std::filesystem::path& RuntimeStore::GetRuntimeRepositoryRoot() const
 {
 	return mRuntimeHost.GetRepoRoot();
 }

-const std::filesystem::path& RuntimeStore::GetUiRoot() const
+const std::filesystem::path& RuntimeStore::GetRuntimeUiRoot() const
 {
 	return mRuntimeHost.GetUiRoot();
 }

-const std::filesystem::path& RuntimeStore::GetDocsRoot() const
+const std::filesystem::path& RuntimeStore::GetRuntimeDocsRoot() const
 {
 	return mRuntimeHost.GetDocsRoot();
 }

-const std::filesystem::path& RuntimeStore::GetRuntimeRoot() const
+const std::filesystem::path& RuntimeStore::GetRuntimeDataRoot() const
 {
 	return mRuntimeHost.GetRuntimeRoot();
 }

-unsigned short RuntimeStore::GetServerPort() const
+unsigned short RuntimeStore::GetConfiguredControlServerPort() const
 {
 	return mRuntimeHost.GetServerPort();
 }

-unsigned short RuntimeStore::GetOscPort() const
+unsigned short RuntimeStore::GetConfiguredOscPort() const
 {
 	return mRuntimeHost.GetOscPort();
 }

-const std::string& RuntimeStore::GetOscBindAddress() const
+const std::string& RuntimeStore::GetConfiguredOscBindAddress() const
 {
 	return mRuntimeHost.GetOscBindAddress();
 }

-double RuntimeStore::GetOscSmoothing() const
+double RuntimeStore::GetConfiguredOscSmoothing() const
 {
 	return mRuntimeHost.GetOscSmoothing();
 }

-unsigned RuntimeStore::GetMaxTemporalHistoryFrames() const
+unsigned RuntimeStore::GetConfiguredMaxTemporalHistoryFrames() const
 {
 	return mRuntimeHost.GetMaxTemporalHistoryFrames();
 }

-unsigned RuntimeStore::GetPreviewFps() const
+unsigned RuntimeStore::GetConfiguredPreviewFps() const
 {
 	return mRuntimeHost.GetPreviewFps();
 }

-bool RuntimeStore::ExternalKeyingEnabled() const
+bool RuntimeStore::IsExternalKeyingConfigured() const
 {
 	return mRuntimeHost.ExternalKeyingEnabled();
 }

-const std::string& RuntimeStore::GetInputVideoFormat() const
+const std::string& RuntimeStore::GetConfiguredInputVideoFormat() const
 {
 	return mRuntimeHost.GetInputVideoFormat();
 }

-const std::string& RuntimeStore::GetInputFrameRate() const
+const std::string& RuntimeStore::GetConfiguredInputFrameRate() const
 {
 	return mRuntimeHost.GetInputFrameRate();
 }

-const std::string& RuntimeStore::GetOutputVideoFormat() const
+const std::string& RuntimeStore::GetConfiguredOutputVideoFormat() const
 {
 	return mRuntimeHost.GetOutputVideoFormat();
 }

-const std::string& RuntimeStore::GetOutputFrameRate() const
+const std::string& RuntimeStore::GetConfiguredOutputFrameRate() const
 {
 	return mRuntimeHost.GetOutputFrameRate();
 }
--- a/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeStore.h
+++ b/apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeStore.h
@@ -10,38 +10,37 @@ class RuntimeStore
 public:
 	explicit RuntimeStore(RuntimeHost& runtimeHost);

-	bool Initialize(std::string& error);
+	bool InitializeStore(std::string& error);
+	std::string BuildPersistentStateJson() const;

-	bool AddLayer(const std::string& shaderId, std::string& error);
-	bool RemoveLayer(const std::string& layerId, std::string& error);
-	bool MoveLayer(const std::string& layerId, int direction, std::string& error);
-	bool MoveLayerToIndex(const std::string& layerId, std::size_t targetIndex, std::string& error);
-	bool SetLayerBypass(const std::string& layerId, bool bypassed, std::string& error);
-	bool SetLayerShader(const std::string& layerId, const std::string& shaderId, std::string& error);
-	bool UpdateLayerParameter(const std::string& layerId, const std::string& parameterId, const JsonValue& newValue, std::string& error);
-	bool UpdateLayerParameterByControlKey(const std::string& layerKey, const std::string& parameterKey, const JsonValue& newValue, std::string& error);
-	bool UpdateLayerParameterByControlKey(const std::string& layerKey, const std::string& parameterKey, const JsonValue& newValue, bool persistState, std::string& error);
-	bool ResetLayerParameters(const std::string& layerId, std::string& error);
-	bool SaveStackPreset(const std::string& presetName, std::string& error) const;
-	bool LoadStackPreset(const std::string& presetName, std::string& error);
+	bool CreateStoredLayer(const std::string& shaderId, std::string& error);
+	bool DeleteStoredLayer(const std::string& layerId, std::string& error);
+	bool MoveStoredLayer(const std::string& layerId, int direction, std::string& error);
+	bool MoveStoredLayerToIndex(const std::string& layerId, std::size_t targetIndex, std::string& error);
+	bool SetStoredLayerBypassState(const std::string& layerId, bool bypassed, std::string& error);
+	bool SetStoredLayerShaderSelection(const std::string& layerId, const std::string& shaderId, std::string& error);
+	bool SetStoredParameterValue(const std::string& layerId, const std::string& parameterId, const JsonValue& newValue, std::string& error);
+	bool SetStoredParameterValueByControlKey(const std::string& layerKey, const std::string& parameterKey, const JsonValue& newValue, std::string& error);
+	bool SetStoredParameterValueByControlKey(const std::string& layerKey, const std::string& parameterKey, const JsonValue& newValue, bool persistState, std::string& error);
+	bool ResetStoredLayerParameterValues(const std::string& layerId, std::string& error);
+	bool SaveStackPresetSnapshot(const std::string& presetName, std::string& error) const;
+	bool LoadStackPresetSnapshot(const std::string& presetName, std::string& error);

-	std::string BuildStateJson() const;
-
-	const std::filesystem::path& GetRepoRoot() const;
-	const std::filesystem::path& GetUiRoot() const;
-	const std::filesystem::path& GetDocsRoot() const;
-	const std::filesystem::path& GetRuntimeRoot() const;
-	unsigned short GetServerPort() const;
-	unsigned short GetOscPort() const;
-	const std::string& GetOscBindAddress() const;
-	double GetOscSmoothing() const;
-	unsigned GetMaxTemporalHistoryFrames() const;
-	unsigned GetPreviewFps() const;
-	bool ExternalKeyingEnabled() const;
-	const std::string& GetInputVideoFormat() const;
-	const std::string& GetInputFrameRate() const;
-	const std::string& GetOutputVideoFormat() const;
-	const std::string& GetOutputFrameRate() const;
+	const std::filesystem::path& GetRuntimeRepositoryRoot() const;
+	const std::filesystem::path& GetRuntimeUiRoot() const;
+	const std::filesystem::path& GetRuntimeDocsRoot() const;
+	const std::filesystem::path& GetRuntimeDataRoot() const;
+	unsigned short GetConfiguredControlServerPort() const;
+	unsigned short GetConfiguredOscPort() const;
+	const std::string& GetConfiguredOscBindAddress() const;
+	double GetConfiguredOscSmoothing() const;
+	unsigned GetConfiguredMaxTemporalHistoryFrames() const;
+	unsigned GetConfiguredPreviewFps() const;
+	bool IsExternalKeyingConfigured() const;
+	const std::string& GetConfiguredInputVideoFormat() const;
+	const std::string& GetConfiguredInputFrameRate() const;
+	const std::string& GetConfiguredOutputVideoFormat() const;
+	const std::string& GetConfiguredOutputFrameRate() const;

 	void SetCompileStatus(bool succeeded, const std::string& message);
 	void ClearReloadRequest();