dahjah/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2025-12-16 04:08:48 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

GSRunner: Fix incorrect total/average counters

Browse Source
This commit is contained in:
Stenzek 2023-07-22 01:17:53 +10:00 committed by refractionpcsx2
parent e4b1c89719
commit 3991ff5d3a
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pcsx2-gsrunner/Main.cpp
View File

@ -80,6 +80,11 @@ static bool s_no_console = false;
// Owned by the GS thread. // Owned by the GS thread.
static u32 s_dump_frame_number = 0; static u32 s_dump_frame_number = 0;
static u32 s_loop_number = s_loop_count; static u32 s_loop_number = s_loop_count;
static double s_last_draws = 0;
static double s_last_render_passes = 0;
static double s_last_barriers = 0;
static double s_last_copies = 0;
static double s_last_uploads = 0;
static u64 s_total_draws = 0; static u64 s_total_draws = 0;
static u64 s_total_render_passes = 0; static u64 s_total_render_passes = 0;
static u64 s_total_barriers = 0; static u64 s_total_barriers = 0;
@ -277,11 +282,17 @@ void Host::BeginPresentFrame()
if (GSConfig.UseHardwareRenderer()) if (GSConfig.UseHardwareRenderer())
{ {
s_total_draws += static_cast<u64>(g_perfmon.GetCounter(GSPerfMon::DrawCalls)); static constexpr auto update_stat = [](GSPerfMon::counter_t counter, u64& dst, double& last) {
s_total_render_passes += static_cast<u64>(g_perfmon.GetCounter(GSPerfMon::RenderPasses)); // perfmon resets every 30 frames to zero
s_total_barriers += static_cast<u64>(g_perfmon.GetCounter(GSPerfMon::Barriers)); const double val = g_perfmon.GetCounter(counter);
s_total_copies += static_cast<u64>(g_perfmon.GetCounter(GSPerfMon::TextureCopies)); dst += static_cast<u64>((val < last) ? val : (val - last));
s_total_uploads += static_cast<u64>(g_perfmon.GetCounter(GSPerfMon::TextureUploads)); last = val;
};
update_stat(GSPerfMon::DrawCalls, s_total_draws, s_last_draws);
update_stat(GSPerfMon::RenderPasses, s_total_render_passes, s_last_render_passes);
update_stat(GSPerfMon::Barriers, s_total_barriers, s_last_barriers);
update_stat(GSPerfMon::TextureCopies, s_total_copies, s_last_copies);
update_stat(GSPerfMon::TextureUploads, s_total_uploads, s_last_uploads);
s_total_frames++; s_total_frames++;
std::atomic_thread_fence(std::memory_order_release); std::atomic_thread_fence(std::memory_order_release);
} }