Render changes

apps/RenderCadenceCompositor/render/RenderThread.cpp

@@ -6,6 +6,7 @@
 #include "../platform/HiddenGlWindow.h"
 #include "Bgra8ReadbackPipeline.h"
 #include "GLExtensions.h"
+#include "RuntimeRenderScene.h"
 #include "RuntimeShaderRenderer.h"
 #include "SimpleMotionRenderer.h"
 
@@ -94,7 +95,7 @@ void RenderThread::ThreadMain()
 	}
 
 	SimpleMotionRenderer renderer;
-	RuntimeShaderRenderer runtimeShaderRenderer;
+	RuntimeRenderScene runtimeRenderScene;
 	Bgra8ReadbackPipeline readback;
 	if (!renderer.InitializeGl(mConfig.width, mConfig.height) || !readback.Initialize(mConfig.width, mConfig.height, mConfig.pboDepth))
 	{
@@ -126,10 +127,10 @@ void RenderThread::ThreadMain()
 			continue;
 		}
 
-		TryCommitReadyRuntimeShader(runtimeShaderRenderer);
-		if (!readback.RenderAndQueue(frameIndex, [this, &renderer, &runtimeShaderRenderer](uint64_t index) {
-			if (runtimeShaderRenderer.HasProgram())
-				runtimeShaderRenderer.RenderFrame(index, mConfig.width, mConfig.height);
+		TryCommitReadyRuntimeShader(runtimeRenderScene);
+		if (!readback.RenderAndQueue(frameIndex, [this, &renderer, &runtimeRenderScene](uint64_t index) {
+			if (runtimeRenderScene.HasLayers())
+				runtimeRenderScene.RenderFrame(index, mConfig.width, mConfig.height);
 			else
 				renderer.RenderFrame(index);
 		}))
@@ -157,7 +158,7 @@ void RenderThread::ThreadMain()
 	}
 
 	readback.Shutdown();
-	runtimeShaderRenderer.ShutdownGl();
+	runtimeRenderScene.ShutdownGl();
 	renderer.ShutdownGl();
 	window.ClearCurrent();
 	mRunning.store(false, std::memory_order_release);
@@ -204,6 +205,13 @@ void RenderThread::SubmitRuntimeShaderArtifact(const RuntimeShaderArtifact& arti
 	mHasPendingShaderArtifact = true;
 }
 
+void RenderThread::SubmitRuntimeRenderLayers(const std::vector<RenderCadenceCompositor::RuntimeRenderLayerModel>& layers)
+{
+	std::lock_guard<std::mutex> lock(mRenderLayersMutex);
+	mPendingRenderLayers = layers;
+	mHasPendingRenderLayers = true;
+}
+
 bool RenderThread::TryTakePendingRuntimeShaderArtifact(RuntimeShaderArtifact& artifact)
 {
 	std::lock_guard<std::mutex> lock(mShaderArtifactMutex);
@@ -216,14 +224,52 @@ bool RenderThread::TryTakePendingRuntimeShaderArtifact(RuntimeShaderArtifact& ar
 	return true;
 }
 
-void RenderThread::TryCommitReadyRuntimeShader(RuntimeShaderRenderer& runtimeShaderRenderer)
+bool RenderThread::TryTakePendingRenderLayers(std::vector<RenderCadenceCompositor::RuntimeRenderLayerModel>& layers)
 {
+	std::lock_guard<std::mutex> lock(mRenderLayersMutex);
+	if (!mHasPendingRenderLayers)
+		return false;
+
+	layers = std::move(mPendingRenderLayers);
+	mPendingRenderLayers.clear();
+	mHasPendingRenderLayers = false;
+	return true;
+}
+
+void RenderThread::TryCommitReadyRuntimeShader(RuntimeRenderScene& runtimeRenderScene)
+{
+	std::vector<RenderCadenceCompositor::RuntimeRenderLayerModel> layers;
+	std::string commitError;
+	if (TryTakePendingRenderLayers(layers))
+	{
+		if (!runtimeRenderScene.CommitRenderLayers(layers, commitError))
+		{
+			RenderCadenceCompositor::TryLog(
+				RenderCadenceCompositor::LogLevel::Error,
+				"render-thread",
+				"Runtime render-layer commit failed: " + commitError);
+			mShaderBuildFailures.fetch_add(1, std::memory_order_relaxed);
+			return;
+		}
+
+		RenderCadenceCompositor::TryLog(
+			RenderCadenceCompositor::LogLevel::Log,
+			"render-thread",
+			"Runtime render layer snapshot committed.");
+		mShaderBuildsCommitted.fetch_add(1, std::memory_order_relaxed);
+		return;
+	}
+
 	RuntimeShaderArtifact artifact;
 	if (!TryTakePendingRuntimeShaderArtifact(artifact))
 		return;
 
-	std::string commitError;
-	if (!runtimeShaderRenderer.CommitShaderArtifact(artifact, commitError))
+	RenderCadenceCompositor::RuntimeRenderLayerModel layer;
+	layer.id = artifact.layerId.empty() ? "runtime-layer-1" : artifact.layerId;
+	layer.shaderId = artifact.shaderId;
+	layer.artifact = artifact;
+	layers.push_back(std::move(layer));
+	if (!runtimeRenderScene.CommitRenderLayers(layers, commitError))
 	{
 		RenderCadenceCompositor::TryLog(
 			RenderCadenceCompositor::LogLevel::Error,