From 1466e162f354d0403f111f0d356278f58a5d49ab Mon Sep 17 00:00:00 2001
From: purplemarshmallow <purplemarshmallow@users.noreply.github.com>
Date: Tue, 10 Nov 2015 21:34:23 +0100
Subject: [PATCH] remove detectCFB hack

if there is no buffer RDRAM content is displayed. If there's an invalid
buffer the buffer is removed and then RDRAM content is displayed. No
game needs the detectCFB hack anymore. This fixes the transitions in BIO
F.R.E.A.K.S #562 and also #362
---
 src/VI.cpp | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/VI.cpp b/src/VI.cpp
index 78e5e755..d7539843 100644
--- a/src/VI.cpp
+++ b/src/VI.cpp
@@ -86,8 +86,6 @@ void VI_UpdateSize()
 
 void VI_UpdateScreen()
 {
-	static u32 uNumCurFrameIsShown = 0;
-
 	if (VI.lastOrigin == -1) // Workaround for Mupen64Plus issue with initialization
 		isGLError();
 
@@ -109,12 +107,20 @@ void VI_UpdateScreen()
 	}
 
 	if (config.frameBufferEmulation.enable) {
+
+		FrameBuffer * pBuffer = frameBufferList().findBuffer(*REG.VI_ORIGIN);
+		if (pBuffer == NULL)
+			gDP.changed |= CHANGED_CPU_FB_WRITE;
+		else if (!pBuffer->isValid()) {
+			gDP.changed |= CHANGED_CPU_FB_WRITE;
+			frameBufferList().removeBuffer(pBuffer->m_startAddress);
+		}
+
 		const bool bCFB = (gDP.changed&CHANGED_CPU_FB_WRITE) == CHANGED_CPU_FB_WRITE;
 		const bool bNeedUpdate = (bCFB ? true : (*REG.VI_ORIGIN != VI.lastOrigin)) || ((config.generalEmulation.hacks & hack_VIUpdateOnCIChange) != 0 && gDP.colorImage.changed != 0);
 
 		if (bNeedUpdate) {
 			if (bCFB) {
-				FrameBuffer * pBuffer = frameBufferList().findBuffer(*REG.VI_ORIGIN);
 				if (pBuffer == NULL || pBuffer->m_width != VI.width) {
 					if (!bVIUpdated) {
 						VI_UpdateSize();
@@ -134,25 +140,13 @@ void VI_UpdateScreen()
 				FrameBuffer_CopyFromRDRAM(*REG.VI_ORIGIN, config.frameBufferEmulation.copyFromRDRAM && !bCFB);
 			}
 			frameBufferList().renderBuffer(*REG.VI_ORIGIN);
-
-			if (gDP.colorImage.changed)
-				uNumCurFrameIsShown = 0;
-			else if (config.frameBufferEmulation.detectCFB != 0) {
-				uNumCurFrameIsShown++;
-				if (uNumCurFrameIsShown > 25)
-					gDP.changed |= CHANGED_CPU_FB_WRITE;
-			}
 			frameBufferList().clearBuffersChanged();
 			VI.lastOrigin = *REG.VI_ORIGIN;
 #ifdef DEBUG
 			while (Debug.paused && !Debug.step);
 			Debug.step = FALSE;
 #endif
-		} else if (config.frameBufferEmulation.detectCFB != 0) {
-			uNumCurFrameIsShown++;
-			if (uNumCurFrameIsShown > 25)
-				gDP.changed |= CHANGED_CPU_FB_WRITE;
-		}
+		} 
 	}
 	else {
 		if (gDP.changed & CHANGED_COLORBUFFER) {