diff options
| author | Sam Belliveau <sam.belliveau@gmail.com> | 2023-01-29 13:33:48 -0500 |
|---|---|---|
| committer | Sam Belliveau <sam.belliveau@gmail.com> | 2023-01-29 13:33:48 -0500 |
| commit | ebf114aef5637bf35e1d843126c466fee916db8e (patch) | |
| tree | c1127e3e5c0c935fb3a97ba6ccfc22e449c6a6d2 /Source/Core/VideoCommon | |
| parent | 41272dc5f1b62f4a5a0562cc29eb3e83367d0f14 (diff) | |
Tie Speed to CPU Speed and not VPS
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/PerformanceMetrics.cpp | 9 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/PerformanceMetrics.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/PerformanceMetrics.cpp b/Source/Core/VideoCommon/PerformanceMetrics.cpp index b343af0f4f..923860cf8d 100644 --- a/Source/Core/VideoCommon/PerformanceMetrics.cpp +++ b/Source/Core/VideoCommon/PerformanceMetrics.cpp @@ -34,7 +34,6 @@ void PerformanceMetrics::CountFrame() void PerformanceMetrics::CountVBlank() { m_vps_counter.Count(); - m_speed_counter.Count(); } void PerformanceMetrics::CountThrottleSleep(DT sleep) @@ -46,6 +45,8 @@ void PerformanceMetrics::CountThrottleSleep(DT sleep) void PerformanceMetrics::CountPerformanceMarker(Core::System& system, s64 cyclesLate) { std::unique_lock lock(m_time_lock); + m_speed_counter.Count(); + m_real_times[m_time_index] = Clock::now() - m_time_sleeping; m_cpu_times[m_time_index] = system.GetCoreTiming().GetCPUTimePoint(cyclesLate); m_time_index += 1; @@ -63,7 +64,7 @@ double PerformanceMetrics::GetVPS() const double PerformanceMetrics::GetSpeed() const { - return m_speed_counter.GetHzAvg() / VideoInterface::GetTargetRefreshRate(); + return m_speed_counter.GetHzAvg() / 100.0; } double PerformanceMetrics::GetMaxSpeed() const @@ -147,8 +148,8 @@ void PerformanceMetrics::DrawImGuiStats(const float backbuffer_scale) const DT frame_time = m_fps_counter.GetDtAvg() + 2 * m_fps_counter.GetDtStd(); const double target_max_time = DT_ms(vblank_time + frame_time).count(); const double a = - std::max(0.0, 1.0 - std::exp(-4.0 * (DT_s(m_vps_counter.GetLastRawDt()) / - DT_s(m_vps_counter.GetSampleWindow())))); + std::max(0.0, 1.0 - std::exp(-4.0 * (DT_s(m_fps_counter.GetLastRawDt()) / + DT_s(m_fps_counter.GetSampleWindow())))); if (std::isfinite(m_graph_max_time)) m_graph_max_time += a * (target_max_time - m_graph_max_time); diff --git a/Source/Core/VideoCommon/PerformanceMetrics.h b/Source/Core/VideoCommon/PerformanceMetrics.h index 009c27fd3f..40fa3f687f 100644 --- a/Source/Core/VideoCommon/PerformanceMetrics.h +++ b/Source/Core/VideoCommon/PerformanceMetrics.h @@ -47,7 +47,7 @@ public: private: PerformanceTracker m_fps_counter{"render_times.txt"}; PerformanceTracker m_vps_counter{"vblank_times.txt"}; - PerformanceTracker m_speed_counter{std::nullopt, 500000}; + PerformanceTracker m_speed_counter{std::nullopt, 1000000}; double m_graph_max_time = 0.0; |
