Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 15:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

System: Fix present skip getting activated on unpause

Browse source 
When using vsync+sync to host refresh+optimal frame pacing.
This commit is contained in:
Connor McLaughlin 2022-08-16 21:23:14 +10:00
parent 2703880d69
commit 86cba1e04d
2 changed files with 39 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/analog_controller.h
View file

@ -62,6 +62,7 @@ public:
static std::unique_ptr<AnalogController> Create(u32 index); static std::unique_ptr<AnalogController> Create(u32 index);
ControllerType GetType() const override; ControllerType GetType() const override;
bool InAnalogMode() const { return m_analog_mode; }
void Reset() override; void Reset() override;
bool DoState(StateWrapper& sw, bool ignore_input_state) override; bool DoState(StateWrapper& sw, bool ignore_input_state) override;

74
src/core/system.cpp
View file

@ -147,11 +147,12 @@ static float s_target_speed = 1.0f;
static Common::Timer::Value s_frame_period = 0; static Common::Timer::Value s_frame_period = 0;
static Common::Timer::Value s_next_frame_time = 0; static Common::Timer::Value s_next_frame_time = 0;
static bool m_frame_step_request = false; static bool s_frame_step_request = false;
static bool m_fast_forward_enabled = false; static bool s_fast_forward_enabled = false;
static bool m_turbo_enabled = false; static bool s_turbo_enabled = false;
static bool m_throttler_enabled = true; static bool s_throttler_enabled = true;
static bool m_display_all_frames = true; static bool s_display_all_frames = true;
static bool s_syncing_to_host = false;
static float s_average_frame_time_accumulator = 0.0f; static float s_average_frame_time_accumulator = 0.0f;
static float s_worst_frame_time_accumulator = 0.0f; static float s_worst_frame_time_accumulator = 0.0f;
@ -1267,8 +1268,8 @@ bool System::Initialize(bool force_software_renderer)
s_throttle_frequency = 60.0f; s_throttle_frequency = 60.0f;
s_frame_period = 0; s_frame_period = 0;
s_next_frame_time = 0; s_next_frame_time = 0;
m_turbo_enabled = false; s_turbo_enabled = false;
m_fast_forward_enabled = false; s_fast_forward_enabled = false;
s_average_frame_time_accumulator = 0.0f; s_average_frame_time_accumulator = 0.0f;
s_worst_frame_time_accumulator = 0.0f; s_worst_frame_time_accumulator = 0.0f;
@ -1436,7 +1437,7 @@ void System::Execute()
{ {
while (System::IsRunning()) while (System::IsRunning())
{ {
if (m_display_all_frames) if (s_display_all_frames)
System::RunFrame(); System::RunFrame();
else else
System::RunFrames(); System::RunFrames();
@ -1446,9 +1447,9 @@ void System::Execute()
if (!IsValid()) if (!IsValid())
return; return;
if (m_frame_step_request) if (s_frame_step_request)
{ {
m_frame_step_request = false; s_frame_step_request = false;
PauseSystem(true); PauseSystem(true);
} }
@ -1456,7 +1457,7 @@ void System::Execute()
System::UpdatePerformanceCounters(); System::UpdatePerformanceCounters();
if (m_throttler_enabled) if (s_throttler_enabled)
System::Throttle(); System::Throttle();
} }
} }
@ -2193,13 +2194,13 @@ void System::ResetPerformanceCounters()
void System::UpdateSpeedLimiterState() void System::UpdateSpeedLimiterState()
{ {
const float old_target_speed = s_target_speed; const float old_target_speed = s_target_speed;
s_target_speed = m_turbo_enabled ? s_target_speed = s_turbo_enabled ?
g_settings.turbo_speed : g_settings.turbo_speed :
(m_fast_forward_enabled ? g_settings.fast_forward_speed : g_settings.emulation_speed); (s_fast_forward_enabled ? g_settings.fast_forward_speed : g_settings.emulation_speed);
m_throttler_enabled = (s_target_speed != 0.0f); s_throttler_enabled = (s_target_speed != 0.0f);
m_display_all_frames = !m_throttler_enabled || g_settings.display_all_frames; s_display_all_frames = !s_throttler_enabled || g_settings.display_all_frames;
bool syncing_to_host = false; s_syncing_to_host = false;
if (g_settings.sync_to_host_refresh_rate && (g_settings.audio_stretch_mode != AudioStretchMode::Off) && if (g_settings.sync_to_host_refresh_rate && (g_settings.audio_stretch_mode != AudioStretchMode::Off) &&
s_target_speed == 1.0f && IsValid()) s_target_speed == 1.0f && IsValid())
{ {
@ -2207,14 +2208,21 @@ void System::UpdateSpeedLimiterState()
if (g_host_display->GetHostRefreshRate(&host_refresh_rate)) if (g_host_display->GetHostRefreshRate(&host_refresh_rate))
{ {
const float ratio = host_refresh_rate / System::GetThrottleFrequency(); const float ratio = host_refresh_rate / System::GetThrottleFrequency();
syncing_to_host = (ratio >= 0.95f && ratio <= 1.05f); s_syncing_to_host = (ratio >= 0.95f && ratio <= 1.05f);
Log_InfoPrintf("Refresh rate: Host=%fhz Guest=%fhz Ratio=%f - %s", host_refresh_rate, Log_InfoPrintf("Refresh rate: Host=%fhz Guest=%fhz Ratio=%f - %s", host_refresh_rate,
System::GetThrottleFrequency(), ratio, syncing_to_host ? "can sync" : "can't sync"); System::GetThrottleFrequency(), ratio, s_syncing_to_host ? "can sync" : "can't sync");
if (syncing_to_host) if (s_syncing_to_host)
s_target_speed *= ratio; s_target_speed *= ratio;
} }
} }
// When syncing to host and using vsync, we don't need to sleep.
if (s_syncing_to_host && ShouldUseVSync() && s_display_all_frames)
{
Log_InfoPrintf("Using host vsync for throttling.");
s_throttler_enabled = false;
}
Log_VerbosePrintf("Target speed: %f%%", s_target_speed * 100.0f); Log_VerbosePrintf("Target speed: %f%%", s_target_speed * 100.0f);
if (IsValid()) if (IsValid())
@ -2225,7 +2233,7 @@ void System::UpdateSpeedLimiterState()
// Adjust nominal rate when resampling, or syncing to host. // Adjust nominal rate when resampling, or syncing to host.
const bool rate_adjust = const bool rate_adjust =
(syncing_to_host || g_settings.audio_stretch_mode == AudioStretchMode::Resample) && s_target_speed > 0.0f; (s_syncing_to_host || g_settings.audio_stretch_mode == AudioStretchMode::Resample) && s_target_speed > 0.0f;
stream->SetNominalRate(rate_adjust ? s_target_speed : 1.0f); stream->SetNominalRate(rate_adjust ? s_target_speed : 1.0f);
if (old_target_speed < s_target_speed) if (old_target_speed < s_target_speed)
@ -2240,23 +2248,17 @@ void System::UpdateSpeedLimiterState()
UpdateDisplaySync(); UpdateDisplaySync();
if (g_settings.increase_timer_resolution) if (g_settings.increase_timer_resolution)
SetTimerResolutionIncreased(m_throttler_enabled); SetTimerResolutionIncreased(s_throttler_enabled);
// When syncing to host and using vsync, we don't need to sleep.
if (syncing_to_host && ShouldUseVSync() && m_display_all_frames)
{
Log_InfoPrintf("Using host vsync for throttling.");
m_throttler_enabled = false;
}
} }
void System::UpdateDisplaySync() void System::UpdateDisplaySync()
{ {
const bool video_sync_enabled = ShouldUseVSync(); const bool video_sync_enabled = ShouldUseVSync();
const float max_display_fps = m_throttler_enabled ? 0.0f : g_settings.display_max_fps; const bool syncing_to_host_vsync = (s_syncing_to_host && video_sync_enabled && s_display_all_frames);
Log_VerbosePrintf("Using vsync: %s", video_sync_enabled ? "YES" : "NO"); const float max_display_fps = (s_throttler_enabled || s_syncing_to_host) ? 0.0f : g_settings.display_max_fps;
Log_VerbosePrintf("Using vsync: %s", video_sync_enabled ? "YES" : "NO", syncing_to_host_vsync ? " (for throttling)" : "");
Log_VerbosePrintf("Max display fps: %f (%s)", max_display_fps, Log_VerbosePrintf("Max display fps: %f (%s)", max_display_fps,
m_display_all_frames ? "displaying all frames" : "skipping displaying frames when needed"); s_display_all_frames ? "displaying all frames" : "skipping displaying frames when needed");
g_host_display->SetDisplayMaxFPS(max_display_fps); g_host_display->SetDisplayMaxFPS(max_display_fps);
g_host_display->SetVSync(video_sync_enabled); g_host_display->SetVSync(video_sync_enabled);
@ -2269,7 +2271,7 @@ bool System::ShouldUseVSync()
bool System::IsFastForwardEnabled() bool System::IsFastForwardEnabled()
{ {
return m_fast_forward_enabled; return s_fast_forward_enabled;
} }
void System::SetFastForwardEnabled(bool enabled) void System::SetFastForwardEnabled(bool enabled)
@ -2277,13 +2279,13 @@ void System::SetFastForwardEnabled(bool enabled)
if (!IsValid()) if (!IsValid())
return; return;
m_fast_forward_enabled = enabled; s_fast_forward_enabled = enabled;
UpdateSpeedLimiterState(); UpdateSpeedLimiterState();
} }
bool System::IsTurboEnabled() bool System::IsTurboEnabled()
{ {
return m_turbo_enabled; return s_turbo_enabled;
} }
void System::SetTurboEnabled(bool enabled) void System::SetTurboEnabled(bool enabled)
@ -2291,7 +2293,7 @@ void System::SetTurboEnabled(bool enabled)
if (!IsValid()) if (!IsValid())
return; return;
m_turbo_enabled = enabled; s_turbo_enabled = enabled;
UpdateSpeedLimiterState(); UpdateSpeedLimiterState();
} }
@ -2328,7 +2330,7 @@ void System::DoFrameStep()
return; return;
#endif #endif
m_frame_step_request = true; s_frame_step_request = true;
PauseSystem(false); PauseSystem(false);
} }