render engine updates

apps/LoopThroughWithOpenGLCompositing/gl/RenderEngine.h

@@ -4,7 +4,8 @@
 #include "OpenGLRenderPipeline.h"
 #include "OpenGLRenderer.h"
 #include "OpenGLShaderPrograms.h"
-#include "RenderStateComposer.h"
+#include "RenderFrameState.h"
+#include "RenderFrameStateResolver.h"
 #include "HealthTelemetry.h"
 #include "RuntimeCoordinator.h"
 #include "RuntimeSnapshotProvider.h"
@@ -104,13 +105,11 @@ public:
 	bool TryPresentPreview(bool force, unsigned previewFps, unsigned outputFrameWidth, unsigned outputFrameHeight);
 	bool TryUploadInputFrame(const VideoIOFrame& inputFrame, const VideoIOState& videoState);
 	bool RenderOutputFrame(const RenderPipelineFrameContext& context, VideoIOOutputFrame& outputFrame);
-	bool ResolveRenderLayerStates(
-		bool useCommittedLayerStates,
-		unsigned renderWidth,
-		unsigned renderHeight,
-		double oscSmoothing,
+	bool ResolveRenderFrameState(
+		const RenderFrameInput& input,
 		std::vector<OscOverlayCommitRequest>* commitRequests,
-		std::vector<RuntimeRenderState>& layerStates);
+		RenderFrameState& frameState);
+	void RenderPreparedFrame(const RenderFrameState& frameState);
 	void RenderLayerStack(
 		bool hasInputSource,
 		const std::vector<RuntimeRenderState>& layerStates,
@@ -127,23 +126,11 @@ private:
 	OpenGLRenderPass mRenderPass;
 	OpenGLRenderPipeline mRenderPipeline;
 	OpenGLShaderPrograms mShaderPrograms;
-	RuntimeSnapshotProvider& mRuntimeSnapshotProvider;
 	CRITICAL_SECTION& mMutex;
 	HDC mHdc;
 	HGLRC mHglrc;
 
-	std::vector<RuntimeRenderState> ComposeRenderLayerStates(
-		const std::vector<RuntimeRenderState>& baseStates,
-		bool allowCommit,
-		double smoothing,
-		std::vector<OscOverlayCommitRequest>* commitRequests);
-
-	std::vector<RuntimeRenderState> mCachedLayerRenderStates;
-	uint64_t mCachedRenderStateVersion = 0;
-	uint64_t mCachedParameterStateVersion = 0;
-	unsigned mCachedRenderStateWidth = 0;
-	unsigned mCachedRenderStateHeight = 0;
 	std::chrono::steady_clock::time_point mLastPreviewPresentTime;
-	RenderStateComposer mRenderStateComposer;
+	RenderFrameStateResolver mFrameStateResolver;
 	RuntimeLiveState mRuntimeLiveState;
 };