summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/Fifo.cpp
diff options
context:
space:
mode:
authormemberTwo.mb2 <memberTwo.mb2@gmail.com>2009-01-27 20:59:27 +0000
committermemberTwo.mb2 <memberTwo.mb2@gmail.com>2009-01-27 20:59:27 +0000
commitac80c04eabe0cdf75238ff2af2bad68425016664 (patch)
treeac7ec379196030fa8243cd54e136c6d3ab5c8465 /Source/Core/VideoCommon/Src/Fifo.cpp
parent52deb125999ce0c84ad43826ccc65881ee6542f7 (diff)
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
Diffstat (limited to 'Source/Core/VideoCommon/Src/Fifo.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/Fifo.cpp9
1 files changed, 4 insertions, 5 deletions
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);