Phase 4 step 2a

apps/LoopThroughWithOpenGLCompositing/gl/RenderEngine.cpp

@@ -1,7 +1,5 @@
 #include "RenderEngine.h"
 
-#include "ShaderBuildQueue.h"
-
 #include <gl/gl.h>
 
 #include <algorithm>
@@ -88,48 +86,16 @@ bool RenderEngine::ApplyPreparedShaderBuild(
 	return true;
 }
 
-RenderEngine::PreparedShaderBuildApplyResult RenderEngine::TryApplyReadyShaderBuild(
-	ShaderBuildQueue& shaderBuildQueue,
-	unsigned inputFrameWidth,
-	unsigned inputFrameHeight,
-	bool preserveFeedbackState)
-{
-	PreparedShaderBuildApplyResult result;
-	PreparedShaderBuild readyBuild;
-	if (!shaderBuildQueue.TryConsumeReadyBuild(readyBuild))
-		return result;
-
-	result.hadReadyBuild = true;
-	char compilerErrorMessage[1024] = {};
-	if (!ApplyPreparedShaderBuild(
-		readyBuild,
-		inputFrameWidth,
-		inputFrameHeight,
-		preserveFeedbackState,
-		sizeof(compilerErrorMessage),
-		compilerErrorMessage))
-	{
-		result.errorMessage = compilerErrorMessage;
-		return result;
-	}
-
-	result.applied = true;
-	return result;
-}
-
-const std::vector<RuntimeRenderState>& RenderEngine::CommittedLayerStates() const
-{
-	return mShaderPrograms.CommittedLayerStates();
-}
-
 void RenderEngine::ResetTemporalHistoryState()
 {
-	mShaderPrograms.ResetTemporalHistoryState();
+	mRenderCommandQueue.RequestRenderReset(RenderCommandResetScope::TemporalHistoryOnly);
+	ProcessRenderResetCommandsOnRenderThread();
 }
 
 void RenderEngine::ResetShaderFeedbackState()
 {
-	mShaderPrograms.ResetShaderFeedbackState();
+	mRenderCommandQueue.RequestRenderReset(RenderCommandResetScope::ShaderFeedbackOnly);
+	ProcessRenderResetCommandsOnRenderThread();
 }
 
 void RenderEngine::ApplyRuntimeCoordinatorRenderReset(RuntimeCoordinatorRenderResetScope resetScope)
@@ -137,11 +103,12 @@ void RenderEngine::ApplyRuntimeCoordinatorRenderReset(RuntimeCoordinatorRenderRe
 	switch (resetScope)
 	{
 	case RuntimeCoordinatorRenderResetScope::TemporalHistoryOnly:
-		ResetTemporalHistoryState();
+		mRenderCommandQueue.RequestRenderReset(RenderCommandResetScope::TemporalHistoryOnly);
+		ProcessRenderResetCommandsOnRenderThread();
 		break;
 	case RuntimeCoordinatorRenderResetScope::TemporalHistoryAndFeedback:
-		ResetTemporalHistoryState();
-		ResetShaderFeedbackState();
+		mRenderCommandQueue.RequestRenderReset(RenderCommandResetScope::TemporalHistoryAndFeedback);
+		ProcessRenderResetCommandsOnRenderThread();
 		break;
 	case RuntimeCoordinatorRenderResetScope::None:
 	default:
@@ -149,6 +116,43 @@ void RenderEngine::ApplyRuntimeCoordinatorRenderReset(RuntimeCoordinatorRenderRe
 	}
 }
 
+void RenderEngine::ResetTemporalHistoryStateOnRenderThread()
+{
+	mShaderPrograms.ResetTemporalHistoryState();
+}
+
+void RenderEngine::ResetShaderFeedbackStateOnRenderThread()
+{
+	mShaderPrograms.ResetShaderFeedbackState();
+}
+
+void RenderEngine::ApplyRenderResetOnRenderThread(RenderCommandResetScope resetScope)
+{
+	switch (resetScope)
+	{
+	case RenderCommandResetScope::ShaderFeedbackOnly:
+		ResetShaderFeedbackStateOnRenderThread();
+		break;
+	case RenderCommandResetScope::TemporalHistoryOnly:
+		ResetTemporalHistoryStateOnRenderThread();
+		break;
+	case RenderCommandResetScope::TemporalHistoryAndFeedback:
+		ResetTemporalHistoryStateOnRenderThread();
+		ResetShaderFeedbackStateOnRenderThread();
+		break;
+	case RenderCommandResetScope::None:
+	default:
+		break;
+	}
+}
+
+void RenderEngine::ProcessRenderResetCommandsOnRenderThread()
+{
+	RenderCommandResetScope resetScope = RenderCommandResetScope::None;
+	while (mRenderCommandQueue.TryTakeRenderReset(resetScope))
+		ApplyRenderResetOnRenderThread(resetScope);
+}
+
 void RenderEngine::ClearOscOverlayState()
 {
 	mRuntimeLiveState.Clear();
@@ -195,7 +199,10 @@ bool RenderEngine::TryPresentPreview(bool force, unsigned previewFps, unsigned o
 	if (!TryEnterCriticalSection(&mMutex))
 		return false;
 
-	const bool presented = PresentPreviewOnRenderThread(outputFrameWidth, outputFrameHeight);
+	mRenderCommandQueue.RequestPreviewPresent({ outputFrameWidth, outputFrameHeight });
+	RenderPreviewPresentRequest request;
+	const bool presented = mRenderCommandQueue.TryTakePreviewPresent(request) &&
+		PresentPreviewOnRenderThread(request.outputFrameWidth, request.outputFrameHeight);
 	LeaveCriticalSection(&mMutex);
 	return presented;
 }
@@ -252,6 +259,7 @@ bool RenderEngine::RenderOutputFrame(const RenderPipelineFrameContext& context,
 
 bool RenderEngine::RenderOutputFrameOnRenderThread(const RenderPipelineFrameContext& context, VideoIOOutputFrame& outputFrame)
 {
+	ProcessRenderResetCommandsOnRenderThread();
 	return mRenderPipeline.RenderFrame(context, outputFrame);
 }
 
@@ -333,7 +341,10 @@ bool RenderEngine::CaptureOutputFrameRgbaTopDown(unsigned width, unsigned height
 {
 	EnterCriticalSection(&mMutex);
 	wglMakeCurrent(mHdc, mHglrc);
-	const bool captured = CaptureOutputFrameRgbaTopDownOnRenderThread(width, height, topDownPixels);
+	mRenderCommandQueue.RequestScreenshotCapture({ width, height });
+	RenderScreenshotCaptureRequest request;
+	const bool captured = mRenderCommandQueue.TryTakeScreenshotCapture(request) &&
+		CaptureOutputFrameRgbaTopDownOnRenderThread(request.width, request.height, topDownPixels);
 	wglMakeCurrent(NULL, NULL);
 	LeaveCriticalSection(&mMutex);
 	return captured;