Pass 3

apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeSnapshotProvider.cpp

@@ -1,12 +1,9 @@
 #include "RuntimeSnapshotProvider.h"
 
-#include "ShaderCompiler.h"
-
-#include <filesystem>
 #include <utility>
 
-RuntimeSnapshotProvider::RuntimeSnapshotProvider(RuntimeStore& runtimeStore) :
-	mRuntimeStore(runtimeStore)
+RuntimeSnapshotProvider::RuntimeSnapshotProvider(RenderSnapshotBuilder& renderSnapshotBuilder) :
+	mRenderSnapshotBuilder(renderSnapshotBuilder)
 {
 }
 
@@ -14,36 +11,7 @@ bool RuntimeSnapshotProvider::BuildLayerPassFragmentShaderSources(const std::str
 {
 	try
 	{
-		ShaderPackage shaderPackage;
-		if (!mRuntimeStore.CopyShaderPackageForStoredLayer(layerId, shaderPackage, error))
-			return false;
-
-		std::filesystem::path repoRoot;
-		std::filesystem::path wrapperPath;
-		std::filesystem::path generatedGlslPath;
-		std::filesystem::path patchedGlslPath;
-		unsigned maxTemporalHistoryFrames = 0;
-		mRuntimeStore.GetShaderCompilerInputs(repoRoot, wrapperPath, generatedGlslPath, patchedGlslPath, maxTemporalHistoryFrames);
-
-		ShaderCompiler compiler(
-			repoRoot,
-			wrapperPath,
-			generatedGlslPath,
-			patchedGlslPath,
-			maxTemporalHistoryFrames);
-		passSources.clear();
-		passSources.reserve(shaderPackage.passes.size());
-		for (const ShaderPassDefinition& pass : shaderPackage.passes)
-		{
-			ShaderPassBuildSource passSource;
-			passSource.passId = pass.id;
-			passSource.inputNames = pass.inputNames;
-			passSource.outputName = pass.outputName;
-			if (!compiler.BuildPassFragmentShaderSource(shaderPackage, pass, passSource.fragmentShaderSource, error))
-				return false;
-			passSources.push_back(std::move(passSource));
-		}
-		return true;
+		return mRenderSnapshotBuilder.BuildLayerPassFragmentShaderSources(layerId, passSources, error);
 	}
 	catch (const std::exception& exception)
 	{
@@ -59,20 +27,17 @@ bool RuntimeSnapshotProvider::BuildLayerPassFragmentShaderSources(const std::str
 
 unsigned RuntimeSnapshotProvider::GetMaxTemporalHistoryFrames() const
 {
-	return mRuntimeStore.GetConfiguredMaxTemporalHistoryFrames();
+	return mRenderSnapshotBuilder.GetMaxTemporalHistoryFrames();
 }
 
 RuntimeSnapshotVersions RuntimeSnapshotProvider::GetVersions() const
 {
-	RuntimeSnapshotVersions versions;
-	versions.renderStateVersion = mRuntimeStore.GetRenderStateVersion();
-	versions.parameterStateVersion = mRuntimeStore.GetParameterStateVersion();
-	return versions;
+	return mRenderSnapshotBuilder.GetVersions();
 }
 
 void RuntimeSnapshotProvider::AdvanceFrame()
 {
-	mRuntimeStore.AdvanceFrameCounter();
+	mRenderSnapshotBuilder.AdvanceFrame();
 }
 
 RuntimeRenderStateSnapshot RuntimeSnapshotProvider::PublishRenderStateSnapshot(unsigned outputWidth, unsigned outputHeight) const
@@ -87,7 +52,7 @@ RuntimeRenderStateSnapshot RuntimeSnapshotProvider::PublishRenderStateSnapshot(u
 		RuntimeRenderStateSnapshot snapshot;
 		snapshot.outputWidth = outputWidth;
 		snapshot.outputHeight = outputHeight;
-		mRuntimeStore.BuildLayerRenderStates(outputWidth, outputHeight, snapshot.states);
+		mRenderSnapshotBuilder.BuildLayerRenderStates(outputWidth, outputHeight, snapshot.states);
 
 		const RuntimeSnapshotVersions versionsAfter = GetVersions();
 		if (versionsBefore.renderStateVersion == versionsAfter.renderStateVersion &&
@@ -107,7 +72,7 @@ bool RuntimeSnapshotProvider::TryPublishRenderStateSnapshot(unsigned outputWidth
 		return true;
 
 	std::vector<RuntimeRenderState> states;
-	if (!mRuntimeStore.TryBuildLayerRenderStates(outputWidth, outputHeight, states))
+	if (!mRenderSnapshotBuilder.TryBuildLayerRenderStates(outputWidth, outputHeight, states))
 		return false;
 
 	const RuntimeSnapshotVersions versionsAfter = GetVersions();
@@ -128,7 +93,7 @@ bool RuntimeSnapshotProvider::TryPublishRenderStateSnapshot(unsigned outputWidth
 bool RuntimeSnapshotProvider::TryRefreshPublishedSnapshotParameters(RuntimeRenderStateSnapshot& snapshot) const
 {
 	const uint64_t expectedRenderStateVersion = snapshot.versions.renderStateVersion;
-	if (!mRuntimeStore.TryRefreshLayerParameters(snapshot.states))
+	if (!mRenderSnapshotBuilder.TryRefreshLayerParameters(snapshot.states))
 		return false;
 
 	const RuntimeSnapshotVersions versions = GetVersions();
@@ -142,7 +107,7 @@ bool RuntimeSnapshotProvider::TryRefreshPublishedSnapshotParameters(RuntimeRende
 
 void RuntimeSnapshotProvider::RefreshDynamicRenderStateFields(std::vector<RuntimeRenderState>& states) const
 {
-	mRuntimeStore.RefreshDynamicRenderStateFields(states);
+	mRenderSnapshotBuilder.RefreshDynamicRenderStateFields(states);
 }
 
 bool RuntimeSnapshotProvider::TryGetPublishedRenderStateSnapshot(unsigned outputWidth, unsigned outputHeight,