XFB in SC reverted back to its previous behavior (thx donko). But still hacked in DC (still a FIXME).

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

4 files changed, 9 insertions, 8 deletions

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 34fbfd68ee..848ce21c8a 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -318,6 +318,7 @@ THREAD_RETURN EmuThread(void *pArg)
 	VideoInitialize.pMemoryBase         = Memory::base;
 	VideoInitialize.pKeyPress           = Callback_KeyPress;
 	VideoInitialize.bWii                = _CoreParameter.bWii;
+	VideoInitialize.bUseDualCore		= _CoreParameter.bUseDualCore;
 	Plugins.FreeVideo(); // This is needed for Stop and Start
 	Plugins.GetVideo()->Initialize(&VideoInitialize); // Call the dll
  
diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp
index 55a161b6a3..117d1ac2b7 100644
--- a/Source/Core/Core/Src/HW/SystemTimers.cpp
+++ b/Source/Core/Core/Src/HW/SystemTimers.cpp
@@ -133,7 +133,7 @@ int
 	// For DC watchdog hack
 	// Once every 4 frame-period seems to be enough (arbitrary taking 60fps as the ref).
 	// TODO: make it VI output frame rate compliant (30/60 and 25/50)
-	// Assuming game's frame-finish-watchdog wait more than 10 emulated frame-period before starting its mess.
+	// Assuming game's frame-finish-watchdog wait more than 4 emulated frame-period before starting its mess.
 	FAKE_GP_WATCHDOG_PERIOD = GetTicksPerSecond() / 15;
 ///////////////////////////////////
 
diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp
index de14974faa..5209673243 100644
--- a/Source/Core/Core/Src/HW/VideoInterface.cpp
+++ b/Source/Core/Core/Src/HW/VideoInterface.cpp
@@ -516,7 +516,7 @@ void Update()
 			int yOffset = 0;
 
 			// (mb2) hack: We request XFB updates from CPUthread (here) only when homebrews use directly XFB without FIFO and CP
-			if (CommandProcessor::IsCommandProcessorNotUsed())
+			if (!Core::GetStartupParameter().bUseDualCore || CommandProcessor::IsCommandProcessorNotUsed())
 			{
 				if (NextXFBRender == 1)
 				{
@@ -546,7 +546,8 @@ void Update()
 				if (xfbPtr && video->IsValid())
 				{
 					int fbWidth = m_VIHorizontalStepping.FieldSteps * 16;
-					int fbHeight = (m_VIHorizontalStepping.FbSteps / m_VIHorizontalStepping.FieldSteps) * m_VIVerticalTimingRegister.ACV;				
+					int fbHeight = (m_VIHorizontalStepping.FbSteps / m_VIHorizontalStepping.FieldSteps) * m_VIVerticalTimingRegister.ACV;
+					//LOGV(VIDEOINTERFACE,2,"(VI->XFBUpdate): ptr: %08x | %ix%i", (u32)xfbptr, fbWidth, fbHeight);
 					if (Core::GetStartupParameter().bUseDualCore)
 						// scheduled on EmuThread in DC mode
 						video->Video_UpdateXFB(xfbPtr, fbWidth, fbHeight, yOffset, TRUE); 
diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
index 0007e44b77..2c8b415a88 100644
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ b/Source/Core/VideoCommon/Src/Fifo.cpp
@@ -100,7 +100,7 @@ void Video_SendFifoData(u8* _uData, u32 len)
 void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
 {
     SCPFifoStruct &_fifo = *video_initialize.pCPFifo;
-	u32 distToSend;
+	s32 distToSend;
 
 #ifdef _WIN32
     // TODO(ector): Don't peek so often!
@@ -111,14 +111,14 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
     {
         if (_fifo.CPReadWriteDistance == 0)
 			Common::SleepCurrentThread(1);
-        //etc...
 
+		// Draw XFB if CP/GPfifo isn't used
 		if (g_XFBUpdateRequested)
 		{
 			Video_UpdateXFB(NULL, 0, 0, 0, FALSE);
-			g_XFBUpdateRequested = FALSE;
 			video_initialize.pCopiedToXFB();
 		}
+
         // check if we are able to run this buffer
         if ((_fifo.bFF_GPReadEnable) && _fifo.CPReadWriteDistance && !(_fifo.bFF_BPEnable && _fifo.bFF_Breakpoint))
         {
@@ -162,7 +162,6 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
 				if ( readPtr >= _fifo.CPEnd) 
 					readPtr = _fifo.CPBase;
 #else
-					// sending the whole CPReadWriteDistance
 					distToSend = _fifo.CPReadWriteDistance;
 					// send 1024B chunk max lenght to have better control over PeekMessages' period
 					distToSend = distToSend > 1024 ? 1024 : distToSend;
@@ -177,7 +176,7 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
 				}
 				Video_SendFifoData(uData, distToSend);
                 Common::SyncInterlockedExchange((LONG*)&_fifo.CPReadPointer, readPtr);
-                Common::SyncInterlockedExchangeAdd((LONG*)&_fifo.CPReadWriteDistance, -(s64)distToSend);
+                Common::SyncInterlockedExchangeAdd((LONG*)&_fifo.CPReadWriteDistance, -distToSend);
 			}
 			//video_initialize.pLog("..........................IDLE",FALSE);
 			Common::SyncInterlockedExchange((LONG*)&_fifo.CPReadIdle, 1);