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

Made the MTGS run ~4% faster. 

Important Info for Dual Core users only: This is MTGS only, and does not apply to DualCore mode.  Additionally, basic MTGS mode is now as fast or faster than DualCore mode for many games.

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@364 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine 2008-11-27 13:46:32 +00:00 committed by Gregory Hainaut
parent 2cd7672d57
commit 97d72e2474
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Counters.c
View File

@ -417,7 +417,6 @@ static __forceinline void frameLimit()
// This is the number of consecutive frames we will skip
#define yesSkipFrames (Config.CustomConsecutiveSkip>0) ? Config.CustomConsecutiveSkip : 2
{
const s64 uSlowExpectedEnd = m_iStart + m_iSlowTicks;
const s64 sSlowDeltaTime = iEnd - uSlowExpectedEnd;
@ -491,7 +490,6 @@ static __forceinline void frameLimit()
return;
}
}
}
}
// If we got this far it means the game is running near or above full framerate.

43
pcsx2/GS.cpp
View File

@ -123,7 +123,7 @@ void* GSThreadProc(void* idp);
int g_FFXHack=0;
static bool gsHasToExit=false;
static LONG g_pGSvSyncCount = 0;
//static LONG g_pGSvSyncCount = 0;
#ifdef PCSX2_DEVBUILD
@ -264,6 +264,8 @@ void gsInit()
}
}
//int g_gsFlushing = 0;
__forceinline void gsWaitGS()
{
// [Air] : I'm pretty sure there's no harm in doing doing timeslices
@ -273,13 +275,11 @@ __forceinline void gsWaitGS()
// behavior likely does not mimic Sleep(0). Ideally the usleep(500) should
// be replaced with something that matches Sleep(0) behavior.
/*if( CHECK_DUALCORE ) {
while( *(volatile PU8*)&g_pGSRingPos != *(volatile PU8*)&g_pGSWritePos );
}
else {*/
//InterlockedIncrement( (long*)&g_gsFlushing );
if( !CHECK_DUALCORE ) GS_SETEVENT();
while( *(volatile PU8*)&g_pGSRingPos != *(volatile PU8*)&g_pGSWritePos )
_TIMESLICE();
//InterlockedDecrement( (long*)&g_gsFlushing );
}
// Sets the gsEvent flag and releases a timeslice.
@ -287,8 +287,10 @@ __forceinline void gsWaitGS()
static __forceinline void gsSetEventWait()
{
if( !CHECK_DUALCORE ) {
//InterlockedIncrement( (long*)&g_gsFlushing );
GS_SETEVENT();
_TIMESLICE();
//InterlockedDecrement( (long*)g_gsFlushing );
}
}
@ -324,7 +326,7 @@ void GSRINGBUF_DONECOPY(const u8 *mem, u32 size)
assert( g_pGSRingPos != temp );
InterlockedExchangePointer((void**)&g_pGSWritePos, temp);
if( !CHECK_DUALCORE ) GS_SETEVENT();
//if( !CHECK_DUALCORE ) GS_SETEVENT();
}
@ -525,8 +527,8 @@ void GSRingBufSimplePacket(int type, int data0, int data1, int data2)
assert( future_writepos != *(volatile PU8*)&g_pGSRingPos );
InterlockedExchangePointer((void**)&g_pGSWritePos, future_writepos);
if( !CHECK_DUALCORE )
GS_SETEVENT();
//if( type == GS_RINGTYPE_VSYNC && !CHECK_DUALCORE )
// GS_SETEVENT();
}
void gsReset()
@ -546,7 +548,7 @@ void gsReset()
#endif
gsHasToExit=false;
g_pGSRingPos = g_pGSWritePos;
g_pGSvSyncCount = 0;
//g_pGSvSyncCount = 0;
}
memset(g_path, 0, sizeof(g_path));
@ -1511,6 +1513,7 @@ extern "C" void GSPostVsyncEnd()
//InterlockedIncrement( (volatile LONG*)&g_pGSvSyncCount );
//SysPrintf( " Sending VSync : %d \n", *(volatile LONG*)&g_pGSvSyncCount );
GSRingBufSimplePacket(GS_RINGTYPE_VSYNC, (*(u32*)(PS2MEM_GS+0x1000)&0x2000), 0, 0);
if( !CHECK_DUALCORE ) GS_SETEVENT();
}
else {
GSvsync((*(u32*)(PS2MEM_GS+0x1000)&0x2000));
@ -1574,6 +1577,25 @@ void* GSThreadProc(void* lpParam)
{
break; //exit thread and close gs
}
else
{
/*if( !g_gsFlushing ) && (*(volatile int*)&g_pGSvSyncCount) == 0 )
{
// not enough frames queued up. But if the buffer's filling we should start
// purging the ring buffer anyway:
const long writepos = (long)(*(volatile PU8*)&g_pGSWritePos);
long delta = writepos - (long)g_pGSRingPos;
if( delta < 0 )
{
delta = (writepos - (long)GS_RINGBUFFERBASE) + ((long)(GS_RINGBUFFEREND - g_pGSRingPos));
}
if( delta < (long)(GS_RINGBUFFERSIZE / 2) ) continue;
}*/
//SysPrintf( "Accumulated : %d\n", *(volatile int*)&g_pGSvSyncCount );
}
}
#else
if( !CHECK_DUALCORE ) {
@ -1797,6 +1819,7 @@ void* GSThreadProc(void* lpParam)
// buffer is empty so our vsync must be zero.
//SysPrintf( "Discharged : %d\n", *(volatile int*)&g_pGSvSyncCount );
//if( *(volatile LONG*)&g_pGSvSyncCount != 0 )
// SysPrintf( "MTGS > vSync count mismatch: %d\n", g_pGSvSyncCount );