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

Tweaked frameskipper slightly. Behaves better when using 4 or higher as a skip setting (frameskip settings 0,0,2,4 for example) 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@392 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine 2008-12-04 22:01:49 +00:00 committed by Gregory Hainaut
parent 389d42d83b
commit e8366b171a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcsx2/GS.cpp
View File

@ -1672,7 +1672,6 @@ extern "C" void gsSyncLimiterLostTime( s32 deltaTime )
if( CHECK_MULTIGS ) if( CHECK_MULTIGS )
{ {
//const u32* stp = (u32*)&startTime;
GSRingBufSimplePacket( GSRingBufSimplePacket(
GS_RINGTYPE_STARTTIME, GS_RINGTYPE_STARTTIME,
deltaTime, deltaTime,
@ -1714,9 +1713,9 @@ static __forceinline void frameSkip()
// Skips a sequence of consecutive frames after a sequence of rendered frames // Skips a sequence of consecutive frames after a sequence of rendered frames
// This is the least number of consecutive frames we will render w/o skipping // This is the least number of consecutive frames we will render w/o skipping
#define noSkipFrames ((Config.CustomConsecutiveFrames>0) ? Config.CustomConsecutiveFrames : 1) const int noSkipFrames = ((Config.CustomConsecutiveFrames>0) ? Config.CustomConsecutiveFrames : 1);
// This is the number of consecutive frames we will skip // This is the number of consecutive frames we will skip
#define yesSkipFrames ((Config.CustomConsecutiveSkip>0) ? Config.CustomConsecutiveSkip : 1) const int yesSkipFrames = ((Config.CustomConsecutiveSkip>0) ? Config.CustomConsecutiveSkip : 1);
const u64 iEnd = GetCPUTicks(); const u64 iEnd = GetCPUTicks();
const s64 uSlowExpectedEnd = m_iSlowStart + m_iSlowTicks; const s64 uSlowExpectedEnd = m_iSlowStart + m_iSlowTicks;
@ -1737,7 +1736,11 @@ static __forceinline void frameSkip()
// a full frame, or if we're already skipping (in which case we don't care // a full frame, or if we're already skipping (in which case we don't care
// to avoid errant skips). // to avoid errant skips).
if( (m_justSkipped && (sSlowDeltaTime > m_iSlowTicks/2)) || // Note: The MTGS can go out of phase from the EE, which means that the
// variance for a "nominal" framerate can range from 0 to m_iSlowTicks.
// We also check for that here.
if( (m_justSkipped && (sSlowDeltaTime > m_iSlowTicks)) ||
sSlowDeltaTime > m_iSlowTicks*2 ) sSlowDeltaTime > m_iSlowTicks*2 )
{ {
//SysPrintf( "Frameskip Initiated! Lateness: %d\n", (int)( (sSlowDeltaTime*100) / m_iSlowTicks ) ); //SysPrintf( "Frameskip Initiated! Lateness: %d\n", (int)( (sSlowDeltaTime*100) / m_iSlowTicks ) );
@ -1859,11 +1862,12 @@ extern "C" void gsDynamicSkipEnable()
GS_THREADPROC GS_THREADPROC
{ {
SysPrintf("MTGS > Thread Started, Opening GS Plugin...\n");
g_GsExitCode = GSopen((void *)&pDsp, "PCSX2", 1); g_GsExitCode = GSopen((void *)&pDsp, "PCSX2", 1);
GSCSRr = 0x551B400F; // 0x55190000 GSCSRr = 0x551B400F; // 0x55190000
event_set( g_hGSDone ); event_set( g_hGSDone );
if (g_GsExitCode != 0) { return GS_THREAD_INIT_FAIL; } // error msg will be issued to the user by Plugins.c if (g_GsExitCode != 0) { return GS_THREAD_INIT_FAIL; } // error msg will be issued to the user by Plugins.c
SysPrintf(" > gsOpen done.\n"); SysPrintf("MTGS > GSopen Finished.\n");
#ifdef RINGBUF_DEBUG_STACK #ifdef RINGBUF_DEBUG_STACK
u32 prevCmd=0; u32 prevCmd=0;