parent
c0d9e4e435
commit
c4e4fa53d9
10 changed files with 54 additions and 0 deletions
|
@ -8,7 +8,10 @@
|
|||
#include "common/color.h"
|
||||
#include "common/common_types.h"
|
||||
#include "common/logging/log.h"
|
||||
#include "common/math_util.h"
|
||||
#include "common/microprofile.h"
|
||||
#include "common/thread.h"
|
||||
#include "common/timer.h"
|
||||
#include "common/vector_math.h"
|
||||
#include "core/core_timing.h"
|
||||
#include "core/hle/service/gsp_gpu.h"
|
||||
|
@ -35,6 +38,14 @@ const u64 frame_ticks = 268123480ull / 60;
|
|||
static int vblank_event;
|
||||
/// Total number of frames drawn
|
||||
static u64 frame_count;
|
||||
/// Start clock for frame limiter
|
||||
static u32 time_point;
|
||||
/// Total delay caused by slow frames
|
||||
static float time_delay;
|
||||
constexpr float FIXED_FRAME_TIME = 1000.0f / 60;
|
||||
// Max lag caused by slow frames. Can be adjusted to compensate for too many slow frames. Higher
|
||||
// values increases time needed to limit frame rate after spikes
|
||||
constexpr float MAX_LAG_TIME = 18;
|
||||
|
||||
template <typename T>
|
||||
inline void Read(T& var, const u32 raw_addr) {
|
||||
|
@ -512,6 +523,21 @@ template void Write<u32>(u32 addr, const u32 data);
|
|||
template void Write<u16>(u32 addr, const u16 data);
|
||||
template void Write<u8>(u32 addr, const u8 data);
|
||||
|
||||
static void FrameLimiter() {
|
||||
time_delay += FIXED_FRAME_TIME;
|
||||
time_delay = MathUtil::Clamp(time_delay, -MAX_LAG_TIME, MAX_LAG_TIME);
|
||||
s32 desired_time = static_cast<s32>(time_delay);
|
||||
s32 elapsed_time = static_cast<s32>(Common::Timer::GetTimeMs() - time_point);
|
||||
|
||||
if (elapsed_time < desired_time) {
|
||||
Common::SleepCurrentThread(desired_time - elapsed_time);
|
||||
}
|
||||
|
||||
u32 frame_time = Common::Timer::GetTimeMs() - time_point;
|
||||
|
||||
time_delay -= frame_time;
|
||||
}
|
||||
|
||||
/// Update hardware
|
||||
static void VBlankCallback(u64 userdata, int cycles_late) {
|
||||
frame_count++;
|
||||
|
@ -528,6 +554,12 @@ static void VBlankCallback(u64 userdata, int cycles_late) {
|
|||
// Check for user input updates
|
||||
Service::HID::Update();
|
||||
|
||||
if (!Settings::values.use_vsync && Settings::values.toggle_framelimit) {
|
||||
FrameLimiter();
|
||||
}
|
||||
|
||||
time_point = Common::Timer::GetTimeMs();
|
||||
|
||||
// Reschedule recurrent event
|
||||
CoreTiming::ScheduleEvent(frame_ticks - cycles_late, vblank_event);
|
||||
}
|
||||
|
@ -563,6 +595,7 @@ void Init() {
|
|||
framebuffer_sub.active_fb = 0;
|
||||
|
||||
frame_count = 0;
|
||||
time_point = Common::Timer::GetTimeMs();
|
||||
|
||||
vblank_event = CoreTiming::RegisterEvent("GPU::VBlankCallback", VBlankCallback);
|
||||
CoreTiming::ScheduleEvent(frame_ticks, vblank_event);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue