mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2024-11-25 22:10:59 +00:00
Qcommon_Frame(): Improve max framerate handling when vsync is enabled
When setting rfps based on GLimp_GetRefreshRate() and vid_maxfps, take into account that GLimp_GetRefreshRate() might return a value that's slightly too low (like 58 or 59 when it's 59.95 and should be 60) The 20% tolerance that, in case of vsync enabled, used to be handled with `packetdelta < 0.8 * 1000000/pfps` (and the same for rfps) is now instead added to rfps (and thus implicitly pfps, if it's >= refreshrate)
This commit is contained in:
parent
5a8382064a
commit
7cf1392765
2 changed files with 32 additions and 31 deletions
|
@ -211,7 +211,7 @@ typedef struct
|
|||
keydest_t key_dest;
|
||||
|
||||
int framecount;
|
||||
int realtime; /* always increasing, no clamping, etc */
|
||||
int realtime; /* always increasing, no clamping, etc, in MS */
|
||||
float rframetime; /* seconds since last render frame */
|
||||
float nframetime; /* network frame time */
|
||||
|
||||
|
|
|
@ -550,21 +550,38 @@ Qcommon_Frame(int usec)
|
|||
// Calculate target and renderframerate.
|
||||
if (R_IsVSyncActive())
|
||||
{
|
||||
rfps = GLimp_GetRefreshRate();
|
||||
int refreshrate = GLimp_GetRefreshRate();
|
||||
|
||||
if (rfps > vid_maxfps->value)
|
||||
// using refreshRate - 2, because targeting a value slightly below the
|
||||
// (possibly not 100% correctly reported) refreshRate would introduce jittering, so only
|
||||
// use vid_maxfps if it looks like the user really means it to be different from refreshRate
|
||||
if (vid_maxfps->value < refreshrate - 2 )
|
||||
{
|
||||
rfps = (int)vid_maxfps->value;
|
||||
// we can't have more packet frames than render frames, so limit pfps to rfps
|
||||
pfps = (cl_maxfps->value > rfps) ? rfps : cl_maxfps->value;
|
||||
}
|
||||
else // target refresh rate, not vid_maxfps
|
||||
{
|
||||
// if vsync is active, we increase the target framerate a bit for two reasons
|
||||
// 1. On Windows, GLimp_GetFrefreshRate() (or the SDL counterpart, or even
|
||||
// the underlying WinAPI function) often returns a too small value,
|
||||
// like 58 or 59 when it's really 59.95 and thus (as integer) should be 60
|
||||
// 2. vsync will throttle us to refreshrate anyway, so there is no harm
|
||||
// in starting the frame *a bit* earlier, instead of risking starting
|
||||
// it too late
|
||||
rfps = refreshrate * 1.2f;
|
||||
// we can't have more packet frames than render frames, so limit pfps to rfps
|
||||
// but in this case use tolerance for comparison and assign rfps with tolerance
|
||||
pfps = (cl_maxfps->value < refreshrate - 2) ? cl_maxfps->value : rfps;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
rfps = (int)vid_maxfps->value;
|
||||
}
|
||||
|
||||
// we can't have more packet frames than render frames, so limit pfps to rfps
|
||||
pfps = (cl_maxfps->value > rfps) ? rfps : cl_maxfps->value;
|
||||
|
||||
}
|
||||
|
||||
// Calculate timings.
|
||||
packetdelta += usec;
|
||||
|
@ -575,22 +592,6 @@ Qcommon_Frame(int usec)
|
|||
if (!cl_timedemo->value)
|
||||
{
|
||||
if (cl_async->value)
|
||||
{
|
||||
if (R_IsVSyncActive())
|
||||
{
|
||||
// Network frames.
|
||||
if (packetdelta < (0.8 * (1000000.0f / pfps)))
|
||||
{
|
||||
packetframe = false;
|
||||
}
|
||||
|
||||
// Render frames.
|
||||
if (renderdelta < (0.8 * (1000000.0f / rfps)))
|
||||
{
|
||||
renderframe = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Network frames.
|
||||
if (packetdelta < (1000000.0f / pfps))
|
||||
|
@ -599,11 +600,11 @@ Qcommon_Frame(int usec)
|
|||
}
|
||||
|
||||
// Render frames.
|
||||
if (renderdelta < (1000000.0f ) / rfps)
|
||||
if (renderdelta < (1000000.0f / rfps))
|
||||
{
|
||||
renderframe = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (!renderframe)
|
||||
{
|
||||
// we must have at least one render frame between two packet frames
|
||||
|
|
Loading…
Reference in a new issue