Review: FBO reset

grorp · Nov 17, 2024 · d3c0f1c · d3c0f1c
1 parent 9e38bc7
commit d3c0f1c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/irr/src/COpenGLCoreCacheHandler.h b/irr/src/COpenGLCoreCacheHandler.h
@@ -487,9 +487,9 @@ class COpenGLCoreCacheHandler
 		frameBufferID = FrameBufferID;
 	}
 
-	void setFBO(GLuint frameBufferID, bool force=false)
+	void setFBO(GLuint frameBufferID)
 	{
-		if (FrameBufferID != frameBufferID || force) {
+		if (FrameBufferID != frameBufferID) {
 			Driver->irrGlBindFramebuffer(GL_FRAMEBUFFER, frameBufferID);
 			FrameBufferID = frameBufferID;
 		}

diff --git a/irr/src/COpenGLDriver.cpp b/irr/src/COpenGLDriver.cpp
@@ -670,7 +670,8 @@ void COpenGLDriver::blitRenderTarget(IRenderTarget *from, IRenderTarget *to)
 			0, 0, dst->getSize().Width, dst->getSize().Height,
 			GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT | GL.STENCIL_BUFFER_BIT, GL.NEAREST);
 
-	CacheHandler->setFBO(prev_fbo_id, true);
+	// This resets both read and draw framebuffer. Note that we bypass CacheHandler here.
+	GL.BindFramebuffer(GL.FRAMEBUFFER, prev_fbo_id);
 }
 
 // small helper function to create vertex buffer object address offsets

diff --git a/irr/src/OpenGL/Driver.cpp b/irr/src/OpenGL/Driver.cpp
@@ -694,7 +694,8 @@ void COpenGL3DriverBase::blitRenderTarget(IRenderTarget *from, IRenderTarget *to
 			0, 0, dst->getSize().Width, dst->getSize().Height,
 			GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT | GL.STENCIL_BUFFER_BIT, GL.NEAREST);
 
-	CacheHandler->setFBO(prev_fbo_id, true);
+	// This resets both read and draw framebuffer. Note that we bypass CacheHandler here.
+	GL.BindFramebuffer(GL.FRAMEBUFFER, prev_fbo_id);
 }
 
 //! draws a vertex primitive list