From 16dda97dfaf5df3b3c3dfd465415575e41fdd1d5 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Sat, 4 Feb 2017 15:35:45 +0100
Subject: [PATCH] Get rid of fbo_unbind_read

---
 GPU/GLES/FBO.cpp                    |  4 ----
 GPU/GLES/FBO.h                      |  1 -
 GPU/GLES/FramebufferManagerGLES.cpp | 12 ------------
 3 files changed, 17 deletions(-)

diff --git a/GPU/GLES/FBO.cpp b/GPU/GLES/FBO.cpp
index 586f89f8ee..d9890fa68a 100644
--- a/GPU/GLES/FBO.cpp
+++ b/GPU/GLES/FBO.cpp
@@ -369,10 +369,6 @@ void fbo_bind_for_read(FBO *fbo) {
 	fbo_bind_fb_target(true, fbo->handle);
 }
 
-void fbo_unbind_read() {
-	fbo_bind_fb_target(true, 0);
-}
-
 void fbo_copy_image(FBO *src, int srcLevel, int srcX, int srcY, int srcZ, FBO *dst, int dstLevel, int dstX, int dstY, int dstZ, int width, int height, int depth) {
 #if defined(USING_GLES2)
 #ifndef IOS
diff --git a/GPU/GLES/FBO.h b/GPU/GLES/FBO.h
index 1243c7b5da..a45607f367 100644
--- a/GPU/GLES/FBO.h
+++ b/GPU/GLES/FBO.h
@@ -67,7 +67,6 @@ void fbo_bind_color_as_texture(FBO *fbo, int color);
 void fbo_bind_for_read(FBO *fbo);
 void fbo_unbind();
 void fbo_unbind_render_target();
-void fbo_unbind_read();
 void fbo_destroy(FBO *fbo);
 void fbo_get_dimensions(FBO *fbo, int *w, int *h);
 
diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp
index eb54827afc..1fdf6d4037 100644
--- a/GPU/GLES/FramebufferManagerGLES.cpp
+++ b/GPU/GLES/FramebufferManagerGLES.cpp
@@ -1293,7 +1293,6 @@ void FramebufferManagerGLES::BlitFramebuffer(VirtualFramebuffer *dst, int dstX,
 	glstate.scissorTest.force(false);
 	if (useBlit) {
 		fbo_blit(src->fbo, srcX1, srcY1, srcX2, srcY2, dst->fbo, dstX1, dstY1, dstX2, dstY2, FB_COLOR_BIT, FB_BLIT_NEAREST);
-		fbo_unbind_read();
 	} else {
 		fbo_bind_as_render_target(dst->fbo);
 		fbo_bind_color_as_texture(src->fbo, 0);
@@ -1579,7 +1578,6 @@ void FramebufferManagerGLES::PackFramebufferAsync_(VirtualFramebuffer *vfb) {
 			fbo_bind_for_read(vfb->fbo);
 		} else {
 			ERROR_LOG_REPORT_ONCE(vfbfbozero, SCEGE, "PackFramebufferAsync_: vfb->fbo == 0");
-			fbo_unbind_read();
 			return;
 		}
 
@@ -1588,7 +1586,6 @@ void FramebufferManagerGLES::PackFramebufferAsync_(VirtualFramebuffer *vfb) {
 
 		if (fbStatus != GL_FRAMEBUFFER_COMPLETE) {
 			ERROR_LOG(SCEGE, "Incomplete source framebuffer, aborting read");
-			fbo_unbind_read();
 			return;
 		}
 
@@ -1610,7 +1607,6 @@ void FramebufferManagerGLES::PackFramebufferAsync_(VirtualFramebuffer *vfb) {
 			SafeGLReadPixels(0, 0, vfb->fb_stride, vfb->height, pixelFormat, pixelType, 0);
 		}
 
-		fbo_unbind_read();
 		unbind = true;
 
 		pixelBufObj_[currentPBO_].fb_address = fb_address;
@@ -1633,7 +1629,6 @@ void FramebufferManagerGLES::PackFramebufferSync_(VirtualFramebuffer *vfb, int x
 		fbo_bind_for_read(vfb->fbo);
 	} else {
 		ERROR_LOG_REPORT_ONCE(vfbfbozero, SCEGE, "PackFramebufferSync_: vfb->fbo == 0");
-		fbo_unbind_read();
 		return;
 	}
 
@@ -1693,8 +1688,6 @@ void FramebufferManagerGLES::PackFramebufferSync_(VirtualFramebuffer *vfb, int x
 		GLenum attachments[3] = { GL_COLOR_ATTACHMENT0, GL_DEPTH_ATTACHMENT, GL_STENCIL_ATTACHMENT };
 		glInvalidateFramebuffer(target, 3, attachments);
 	}
-
-	fbo_unbind_read();
 }
 
 void FramebufferManagerGLES::PackDepthbuffer(VirtualFramebuffer *vfb, int x, int y, int w, int h) {
@@ -1736,8 +1729,6 @@ void FramebufferManagerGLES::PackDepthbuffer(VirtualFramebuffer *vfb, int x, int
 			depth[i] = (int)scaled;
 		}
 	}
-
-	fbo_unbind_read();
 }
 
 void FramebufferManagerGLES::EndFrame() {
@@ -1969,14 +1960,11 @@ bool FramebufferManagerGLES::GetFramebuffer(u32 fb_address, int fb_stride, GEBuf
 	SafeGLReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buffer.GetData());
 
 	// We may have clitted to a temp FBO.
-	fbo_unbind_read();
 	RebindFramebuffer();
 	return true;
 }
 
 bool FramebufferManagerGLES::GetOutputFramebuffer(GPUDebugBuffer &buffer) {
-	fbo_unbind_read();
-
 	int pw = PSP_CoreParameter().pixelWidth;
 	int ph = PSP_CoreParameter().pixelHeight;