This should settle the FIFO BP critical games like Metroid Prime 2

G2ME01.ini

[Video]
FIFOBPHack = 1

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4823 8ced0084-cf51-0410-be5f-012b33b47a6e

3 files changed, 16 insertions, 1 deletions

diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
index dff94e2184..c02fd492c7 100644
--- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp
+++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
@@ -69,6 +69,7 @@
 

 #include "Common.h"

 #include "VideoCommon.h"

+#include "VideoConfig.h"

 #include "MathUtil.h"

 #include "Thread.h"

 #include "Atomic.h"

@@ -408,6 +409,12 @@ void Write16(const u16 _Value, const u32 _Address)
 			{

 				// Clear old BP and initiate new BP

 				Common::AtomicStore(fifo.bFF_Breakpoint, 0);

+

+				// The following is a hack of Synchronized Breakpoint for dual core mode

+				// Some games only waits a finite N cycles for FIFO interrupts, then hangs up on time out

+				// e.g. Metriod Prime 2

+				if (g_VideoInitialize.bOnThread && g_ActiveConfig.bFIFOBPhack)

+					UpdateInterrupts(true);

 			}

 

 			INFO_LOG(COMMANDPROCESSOR,"\t write to CTRL_REGISTER : %04x", _Value);

@@ -730,7 +737,10 @@ void UpdateInterrupts(bool active)
 

 void UpdateInterruptsFromVideoPlugin(bool active)

 {

-	g_VideoInitialize.pScheduleEvent_Threadsafe(0, et_UpdateInterrupts, active);

+	if (g_ActiveConfig.bFIFOBPhack)

+		return;

+	else

+		g_VideoInitialize.pScheduleEvent_Threadsafe(0, et_UpdateInterrupts, active);

 }

 

 void SetFifoIdleFromVideoPlugin()

diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 2a2503dec6..100176863f 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -92,6 +92,7 @@ void VideoConfig::Load(const char *ini_file)
     iniFile.Get("Hacks", "EFBCopyDisableHotKey", &bOSDHotKey, 0);
 	iniFile.Get("Hacks", "EFBToTextureEnable", &bCopyEFBToRAM, true);
 	iniFile.Get("Hacks", "EFBScaledCopy", &bCopyEFBScaled, true);
+	iniFile.Get("Hacks", "FIFOBPHack", &bFIFOBPhack, false);
 	iniFile.Get("Hacks", "ProjectionHack", &iPhackvalue, 0);
 
 	iniFile.Get("Hardware", "Adapter", &iAdapter, 0);
@@ -131,6 +132,8 @@ void VideoConfig::GameIniLoad(const char *ini_file)
 		iniFile.Get("Video", "DstAlphaPass", &bDstAlphaPass, false);
 	if (iniFile.Exists("Video", "UseXFB"))
 		iniFile.Get("Video", "UseXFB", &bUseXFB, 0);
+	if (iniFile.Exists("Video", "FIFOBPHack"))
+		iniFile.Get("Video", "FIFOBPHack", &bFIFOBPhack, false);
 	if (iniFile.Exists("Video", "ProjectionHack"))
 		iniFile.Get("Video", "ProjectionHack", &iPhackvalue, 0);
 }
@@ -185,6 +188,7 @@ void VideoConfig::Save(const char *ini_file)
     iniFile.Set("Hacks", "EFBCopyDisableHotKey", bOSDHotKey);
 	iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToRAM);
 	iniFile.Set("Hacks", "EFBScaledCopy", bCopyEFBScaled);
+	iniFile.Set("Hacks", "FIFOBPHack", bFIFOBPhack);
 	iniFile.Set("Hacks", "ProjectionHack", iPhackvalue);
 
 	iniFile.Set("Hardware", "Adapter", iAdapter);
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index 23bc326178..e3dd402c5f 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -111,6 +111,7 @@ struct VideoConfig
 	bool bCopyEFBToRAM;
 	bool bCopyEFBScaled;
     bool bSafeTextureCache;
+	bool bFIFOBPhack;
 	int iPhackvalue;
 	bool bPhackvalue1, bPhackvalue2;
 	float fhackvalue1, fhackvalue2;