actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

It's RageDisplay::EndFrame()'s job to give up CPU between frames. Currently,

Browse Source 
we're doing this partially in EndFrame (in FrameLimitBeforeVsync and/or the
actual vblank wait), and partially in RunGameLoop.  These serve the same
purpose, so merge them.

(The renderer itself should have more control over this, but this is an
improvement.)
This commit is contained in:
Glenn Maynard
2006-04-05 05:36:04 +00:00
parent fea9792fd6
commit 185d3d902d
2 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameLoop.cpp
-11
View File
@@ -179,17 +179,6 @@ void GameLoop::RunGameLoop()
* Render
*/
SCREENMAN->Draw();
/* If we don't have focus, give up lots of CPU. */
// XXX: do this in DISPLAY EndFrame?
if( !HOOKS->AppHasFocus() )
usleep( 10000 );// give some time to other processes and threads
#if defined(_WINDOWS)
/* In Windows, we want to give up some CPU for other threads. Most OS's do
* this more intelligently. */
else
usleep( 1000 ); // give some time to other processes and threads
#endif
}
if( ChangeAppPri() )
stepmania/src/RageDisplay.cpp
+25 -15
View File
@@ -11,6 +11,7 @@
#include "RageSurface.h"
#include "Preference.h"
#include "LocalizedString.h"
#include "arch/ArchHooks/ArchHooks.h"
//
// Statistics stuff
@@ -774,24 +775,33 @@ void RageDisplay::FrameLimitBeforeVsync( int iFPS )
{
ASSERT( iFPS != 0 );
if( g_LastFrameEndedAt.IsZero() )
return;
int iDelayMicroseconds = 0;
if( g_fFrameLimitPercent.Get() > 0.0f && !g_LastFrameEndedAt.IsZero() )
{
float fFrameTime = g_LastFrameEndedAt.GetDeltaTime();
float fExpectedTime = 1.0f / iFPS;
if( g_fFrameLimitPercent.Get() == 0.0f )
return;
/* This is typically used to turn some of the delay that would normally
* be waiting for vsync and turn it into a usleep, to make sure we give
* up the CPU. If we overshoot the sleep, then we'll miss the vsync,
* so allow tweaking the amount of time we expect a frame to take.
* Frame limiting is disabled by setting this to 0. */
fExpectedTime *= g_fFrameLimitPercent.Get();
float fExtraTime = fExpectedTime - fFrameTime;
float fFrameTime = g_LastFrameEndedAt.GetDeltaTime();
float fExpectedTime = 1.0f / iFPS;
iDelayMicroseconds = int(fExtraTime * 1000000);
}
/* This is typically used to turn some of the delay that would normally
* be waiting for vsync and turn it into a usleep, to make sure we give
* up the CPU. If we overshoot the sleep, then we'll miss the vsync,
* so allow tweaking the amount of time we expect a frame to take.
* Frame limiting is disabled by setting this to 0. */
fExpectedTime *= g_fFrameLimitPercent.Get();
float fExtraTime = fExpectedTime - fFrameTime;
if( fExtraTime > 0 )
usleep( int(fExtraTime * 1000000) );
if( !HOOKS->AppHasFocus() )
iDelayMicroseconds = max( iDelayMicroseconds, 10000 ); // give some time to other processes and threads
#if defined(_WINDOWS)
/* In Windows, always explicitly give up a minimum amount of CPU for other threads. */
iDelayMicroseconds = max( iDelayMicroseconds, 1000 );
#endif
if( iDelayMicroseconds > 0 )
usleep( iDelayMicroseconds );
}
void RageDisplay::FrameLimitAfterVsync()