ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ReorderingMTGS: threading bugfixes, ringbuffer would do bad things when it got full (GS load 80%+), or when vsyncs wrapped around the edge of the ring. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/ReorderingMTGS@3507 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-07-17 00:14:41 +00:00
parent 1be80fbe53
commit ce2b9e30fc
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pcsx2/MTGS.cpp
View File

@ -639,7 +639,6 @@ void SysMtgsThread::GenericStall( uint size )
// the block about to be written (writepos + size) // the block about to be written (writepos + size)
uint readpos = volatize(m_ReadPos); uint readpos = volatize(m_ReadPos);
//uint endpos = writepos+size;
uint freeroom; uint freeroom;
if (writepos < readpos) if (writepos < readpos)
@ -647,7 +646,7 @@ void SysMtgsThread::GenericStall( uint size )
else else
freeroom = RingBufferSize - (writepos - readpos); freeroom = RingBufferSize - (writepos - readpos);
if (freeroom < size) if (freeroom <= size)
{ {
// writepos will overlap readpos if we commit the data, so we need to wait until // writepos will overlap readpos if we commit the data, so we need to wait until
// readpos is out past the end of the future write pos, or until it wraps around // readpos is out past the end of the future write pos, or until it wraps around
@ -671,13 +670,20 @@ void SysMtgsThread::GenericStall( uint size )
//Console.WriteLn( Color_Blue, "(EEcore Sleep) PrepDataPacker \tringpos=0x%06x, writepos=0x%06x, signalpos=0x%06x", readpos, writepos, m_SignalRingPosition ); //Console.WriteLn( Color_Blue, "(EEcore Sleep) PrepDataPacker \tringpos=0x%06x, writepos=0x%06x, signalpos=0x%06x", readpos, writepos, m_SignalRingPosition );
do { while(true) {
AtomicExchange( m_SignalRingEnable, 1 ); AtomicExchange( m_SignalRingEnable, 1 );
SetEvent(); SetEvent();
m_sem_OnRingReset.WaitWithoutYield(); m_sem_OnRingReset.WaitWithoutYield();
readpos = volatize(m_ReadPos); readpos = volatize(m_ReadPos);
//Console.WriteLn( Color_Blue, "(EEcore Awake) Report!\tringpos=0x%06x", readpos ); //Console.WriteLn( Color_Blue, "(EEcore Awake) Report!\tringpos=0x%06x", readpos );
} while( (writepos < readpos) && (writepos+size >= readpos) );
if (writepos < readpos)
freeroom = readpos - writepos;
else
freeroom = RingBufferSize - (writepos - readpos);
if (freeroom > size) break;
}
pxAssertDev( m_SignalRingPosition <= 0, "MTGS Thread Synchronization Error" ); pxAssertDev( m_SignalRingPosition <= 0, "MTGS Thread Synchronization Error" );
} }
@ -685,10 +691,17 @@ void SysMtgsThread::GenericStall( uint size )
{ {
//Console.WriteLn( Color_StrongGray, "(EEcore Spin) PrepDataPacket!" ); //Console.WriteLn( Color_StrongGray, "(EEcore Spin) PrepDataPacket!" );
SetEvent(); SetEvent();
do { while(true) {
SpinWait(); SpinWait();
readpos = volatize(m_ReadPos); readpos = volatize(m_ReadPos);
} while( (writepos < readpos) && (writepos+size >= readpos) );
if (writepos < readpos)
freeroom = readpos - writepos;
else
freeroom = RingBufferSize - (writepos - readpos);
if (freeroom > size) break;
}
} }
} }
} }

2
pcsx2/ps2/GIFpath.cpp
View File

@ -558,7 +558,7 @@ __forceinline void MemCopy_WrappedSrc( const u128* srcBase, uint& srcStart, uint
uint firstcopylen = srcSize - srcStart; uint firstcopylen = srcSize - srcStart;
memcpy_qwc(dest, &srcBase[srcStart], firstcopylen ); memcpy_qwc(dest, &srcBase[srcStart], firstcopylen );
srcStart = endpos & srcSize; srcStart = endpos % srcSize;
memcpy_qwc(dest+firstcopylen, srcBase, srcStart ); memcpy_qwc(dest+firstcopylen, srcBase, srcStart );
} }
} }