Fix render target creation not resetting state

pioneerspacesim · Nov 3, 2020 · 4a7167c · 4a7167c
1 parent 9e18c21
commit 4a7167c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/graphics/opengl/RendererGL.cpp b/src/graphics/opengl/RendererGL.cpp
@@ -1172,6 +1172,14 @@ namespace Graphics {
 		rt->CheckStatus();
 		rt->Unbind();
 		CheckRenderErrors(__FUNCTION__, __LINE__);
+
+		// Rebind the active render target
+		if (m_activeRenderTarget)
+			m_activeRenderTarget->Bind();
+		// we can't assume the window render target exists yet because we might be creating it
+		else if (m_windowRenderTarget)
+			m_windowRenderTarget->Bind();
+
 		return rt;
 	}
 

diff --git a/src/graphics/opengl/RendererGL.h b/src/graphics/opengl/RendererGL.h
@@ -150,9 +150,9 @@ namespace Graphics {
 		std::unordered_map<Uint32, OGL::RenderState *> m_renderStates;
 		bool m_useNVDepthRanged;
 		float m_invLogZfarPlus1;
-		OGL::RenderTarget *m_activeRenderTarget;
-		OGL::RenderTarget *m_windowRenderTarget;
-		RenderState *m_activeRenderState;
+		OGL::RenderTarget *m_activeRenderTarget = nullptr;
+		OGL::RenderTarget *m_windowRenderTarget = nullptr;
+		RenderState *m_activeRenderState = nullptr;
 
 		matrix4x4f m_modelViewMat;
 		matrix4x4f m_projectionMat;