Separate history

apps/LoopThroughWithOpenGLCompositing/gl/OpenGLComposite.h

@@ -53,6 +53,7 @@
 #include "DeckLinkAPI_h.h"
 
 #include "GLExtensions.h"
+#include "OpenGLRenderer.h"
 #include "RuntimeHost.h"
 
 #include <atomic>
@@ -101,6 +102,7 @@ public:
 private:
 	void resizeWindow(int width, int height);
 	bool CheckOpenGLExtensions();
+	using LayerProgram = OpenGLRenderer::LayerProgram;
 
 	CaptureDelegate*						mCaptureDelegate;
 	PlayoutDelegate*						mPlayoutDelegate;
@@ -132,82 +134,11 @@ private:
 	bool									mDeckLinkExternalKeyingActive;
 	std::string								mDeckLinkStatusMessage;
 
-	// OpenGL data
-	bool									mFastTransferExtensionAvailable;
-	GLuint									mCaptureTexture;
-	GLuint									mDecodedTexture;
-	GLuint									mLayerTempTexture;
-	GLuint									mFBOTexture;
-	GLuint									mOutputTexture;
-	GLuint									mUnpinnedTextureBuffer;
-	GLuint									mDecodeFrameBuf;
-	GLuint									mLayerTempFrameBuf;
-	GLuint									mIdFrameBuf;
-	GLuint									mOutputFrameBuf;
-	GLuint									mIdColorBuf;
-	GLuint									mIdDepthBuf;
-	GLuint									mFullscreenVAO;
-	GLuint									mGlobalParamsUBO;
-	GLuint									mDecodeProgram;
-	GLuint									mDecodeVertexShader;
-	GLuint									mDecodeFragmentShader;
-	GLsizeiptr								mGlobalParamsUBOSize;
-	int										mViewWidth;
-	int										mViewHeight;
+	std::unique_ptr<OpenGLRenderer>			mRenderer;
 	std::unique_ptr<RuntimeHost>				mRuntimeHost;
 	std::unique_ptr<ControlServer>			mControlServer;
 	std::unique_ptr<OscServer>				mOscServer;
 
-	struct LayerProgram
-	{
-		struct TextureBinding
-		{
-			std::string samplerName;
-			std::filesystem::path sourcePath;
-			GLuint texture = 0;
-		};
-
-		struct TextBinding
-		{
-			std::string parameterId;
-			std::string samplerName;
-			std::string fontId;
-			GLuint texture = 0;
-			std::string renderedText;
-			unsigned renderedWidth = 0;
-			unsigned renderedHeight = 0;
-		};
-
-		std::string layerId;
-		std::string shaderId;
-		GLuint shaderTextureBase = 0;
-		GLuint program = 0;
-		GLuint vertexShader = 0;
-		GLuint fragmentShader = 0;
-		std::vector<TextureBinding> textureBindings;
-		std::vector<TextBinding> textBindings;
-	};
-	std::vector<LayerProgram>				mLayerPrograms;
-
-	struct HistorySlot
-	{
-		GLuint texture = 0;
-		GLuint framebuffer = 0;
-	};
-
-	struct HistoryRing
-	{
-		std::vector<HistorySlot> slots;
-		std::size_t nextWriteIndex = 0;
-		std::size_t filledCount = 0;
-		unsigned effectiveLength = 0;
-		TemporalHistorySource historySource = TemporalHistorySource::None;
-	};
-
-	HistoryRing								mSourceHistoryRing;
-	std::map<std::string, HistoryRing>		mPreLayerHistoryByLayerId;
-	bool									mTemporalHistoryNeedsReset;
-
 	bool InitOpenGLState();
 	bool compileLayerPrograms(int errorMessageSize, char* errorMessage);
 	bool compileSingleLayerProgram(const RuntimeRenderState& state, LayerProgram& layerProgram, int errorMessageSize, char* errorMessage);
@@ -226,13 +157,8 @@ private:
 	bool updateGlobalParamsBuffer(const RuntimeRenderState& state, unsigned availableSourceHistoryLength, unsigned availableTemporalHistoryLength);
 	bool validateTemporalTextureUnitBudget(const std::vector<RuntimeRenderState>& layerStates, std::string& error) const;
 	bool ensureTemporalHistoryResources(const std::vector<RuntimeRenderState>& layerStates, std::string& error);
-	bool createHistoryRing(HistoryRing& ring, unsigned effectiveLength, TemporalHistorySource historySource, std::string& error);
-	void destroyHistoryRing(HistoryRing& ring);
-	void destroyTemporalHistoryResources();
 	void resetTemporalHistoryState();
-	void pushFramebufferToHistoryRing(GLuint sourceFramebuffer, HistoryRing& ring);
 	void bindHistorySamplers(const RuntimeRenderState& state, GLuint currentSourceTexture);
-	GLuint resolveHistoryTexture(const HistoryRing& ring, GLuint fallbackTexture, std::size_t framesAgo) const;
 	unsigned sourceHistoryAvailableCount() const;
 	unsigned temporalHistoryAvailableCountForLayer(const std::string& layerId) const;
 };