Phase 4 step 2a

apps/LoopThroughWithOpenGLCompositing/gl/RenderEngine.h

@@ -4,6 +4,7 @@
 #include "OpenGLRenderPipeline.h"
 #include "OpenGLRenderer.h"
 #include "OpenGLShaderPrograms.h"
+#include "RenderCommandQueue.h"
 #include "RenderFrameState.h"
 #include "RenderFrameStateResolver.h"
 #include "HealthTelemetry.h"
@@ -18,8 +19,6 @@
 #include <string>
 #include <vector>
 
-class ShaderBuildQueue;
-
 class RenderEngine
 {
 public:
@@ -50,13 +49,6 @@ public:
 		uint64_t generation = 0;
 	};
 
-	struct PreparedShaderBuildApplyResult
-	{
-		bool hadReadyBuild = false;
-		bool applied = false;
-		std::string errorMessage;
-	};
-
 	RenderEngine(
 		RuntimeSnapshotProvider& runtimeSnapshotProvider,
 		HealthTelemetry& healthTelemetry,
@@ -79,7 +71,6 @@ public:
 		unsigned outputPackTextureWidth,
 		std::string& error);
 	bool CompileLayerPrograms(unsigned inputFrameWidth, unsigned inputFrameHeight, int errorMessageSize, char* errorMessage);
-	bool CommitPreparedLayerPrograms(const PreparedShaderBuild& preparedBuild, unsigned inputFrameWidth, unsigned inputFrameHeight, int errorMessageSize, char* errorMessage);
 	bool ApplyPreparedShaderBuild(
 		const PreparedShaderBuild& preparedBuild,
 		unsigned inputFrameWidth,
@@ -87,13 +78,7 @@ public:
 		bool preserveFeedbackState,
 		int errorMessageSize,
 		char* errorMessage);
-	PreparedShaderBuildApplyResult TryApplyReadyShaderBuild(
-		ShaderBuildQueue& shaderBuildQueue,
-		unsigned inputFrameWidth,
-		unsigned inputFrameHeight,
-		bool preserveFeedbackState);
 
-	const std::vector<RuntimeRenderState>& CommittedLayerStates() const;
 	void ResetTemporalHistoryState();
 	void ResetShaderFeedbackState();
 	void ApplyRuntimeCoordinatorRenderReset(RuntimeCoordinatorRenderResetScope resetScope);
@@ -110,6 +95,10 @@ public:
 		std::vector<OscOverlayCommitRequest>* commitRequests,
 		RenderFrameState& frameState);
 	void RenderPreparedFrame(const RenderFrameState& frameState);
+	bool CaptureOutputFrameRgbaTopDown(unsigned width, unsigned height, std::vector<unsigned char>& topDownPixels);
+
+private:
+	bool CommitPreparedLayerPrograms(const PreparedShaderBuild& preparedBuild, unsigned inputFrameWidth, unsigned inputFrameHeight, int errorMessageSize, char* errorMessage);
 	void RenderLayerStack(
 		bool hasInputSource,
 		const std::vector<RuntimeRenderState>& layerStates,
@@ -118,9 +107,10 @@ public:
 		unsigned captureTextureWidth,
 		VideoIOPixelFormat inputPixelFormat,
 		unsigned historyCap);
-	bool CaptureOutputFrameRgbaTopDown(unsigned width, unsigned height, std::vector<unsigned char>& topDownPixels);
-
-private:
+	void ResetTemporalHistoryStateOnRenderThread();
+	void ResetShaderFeedbackStateOnRenderThread();
+	void ApplyRenderResetOnRenderThread(RenderCommandResetScope resetScope);
+	void ProcessRenderResetCommandsOnRenderThread();
 	bool PresentPreviewOnRenderThread(unsigned outputFrameWidth, unsigned outputFrameHeight);
 	bool UploadInputFrameOnRenderThread(const VideoIOFrame& inputFrame, const VideoIOState& videoState);
 	bool RenderOutputFrameOnRenderThread(const RenderPipelineFrameContext& context, VideoIOOutputFrame& outputFrame);
@@ -136,6 +126,7 @@ private:
 	HGLRC mHglrc;
 
 	std::chrono::steady_clock::time_point mLastPreviewPresentTime;
+	RenderCommandQueue mRenderCommandQueue;
 	RenderFrameStateResolver mFrameStateResolver;
 	RuntimeLiveState mRuntimeLiveState;
 };