mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-12-16 04:09:39 +00:00
Merge pull request #14157 from jordan-woyak/fix-rush-speed-display
CoreTiming: Fix percent speed display when "Rush Frame Presentation" is enabled.
This commit is contained in:
commit
6464ed9e6b
@ -15,6 +15,7 @@
|
||||
#include "Common/ChunkFile.h"
|
||||
#include "Common/Logging/Log.h"
|
||||
#include "Common/SPSCQueue.h"
|
||||
#include "Common/ScopeGuard.h"
|
||||
|
||||
#include "Core/AchievementManager.h"
|
||||
#include "Core/CPUThreadConfigCallback.h"
|
||||
@ -449,6 +450,12 @@ void CoreTimingManager::Throttle(const s64 target_cycle)
|
||||
if (skip_throttle)
|
||||
return;
|
||||
|
||||
// Measure current performance after throttling.
|
||||
Common::ScopeGuard perf_marker{[&] {
|
||||
g_perf_metrics.CountPerformanceMarker(target_cycle,
|
||||
m_system.GetSystemTimers().GetTicksPerSecond());
|
||||
}};
|
||||
|
||||
if (IsSpeedUnlimited())
|
||||
{
|
||||
ResetThrottle(target_cycle);
|
||||
|
||||
@ -950,9 +950,6 @@ void VideoInterfaceManager::Update(u64 ticks)
|
||||
// Throttle before SI poll so user input is taken just before needed. (lower input latency)
|
||||
core_timing.Throttle(ticks);
|
||||
|
||||
// This is a nice place to measure performance so we don't have to Throttle elsewhere.
|
||||
g_perf_metrics.CountPerformanceMarker(ticks, m_system.GetSystemTimers().GetTicksPerSecond());
|
||||
|
||||
Core::UpdateInputGate(!Config::Get(Config::MAIN_INPUT_BACKGROUND_INPUT),
|
||||
Config::Get(Config::MAIN_LOCK_CURSOR));
|
||||
auto& si = m_system.GetSerialInterface();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user