ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PCSX2-WX: Improve percentage calculation on GSFrame 

Calculate the percentage value using the vertical frequency fetched from counters.
This commit is contained in:
Akash 2016-08-01 20:29:49 +05:30
parent e7f66900fa
commit 005f63d455
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/gui/FrameForGS.cpp
View File

@ -18,7 +18,7 @@
#include "GSFrame.h" #include "GSFrame.h"
#include "AppAccelerators.h" #include "AppAccelerators.h"
#include "AppSaveStates.h" #include "AppSaveStates.h"
#include "Counters.h"
#include "GS.h" #include "GS.h"
#include "MSWstuff.h" #include "MSWstuff.h"
@ -591,8 +591,7 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
AppConfig::UiTemplateOptions& templates = g_Conf->Templates; AppConfig::UiTemplateOptions& templates = g_Conf->Templates;
double fps = wxGetApp().FpsManager.GetFramerate(); double fps = wxGetApp().FpsManager.GetFramerate();
// The "not PAL" case covers both NTSC and Progressive float percentage = (fps * 100) / GetVerticalFrequency().ToFloat();
float per = gsVideoMode == GS_VideoMode::PAL ? (fps * 100) / EmuConfig.GS.FrameratePAL.ToFloat() : (fps * 100) / EmuConfig.GS.FramerateNTSC.ToFloat();
char gsDest[128]; char gsDest[128];
gsDest[0] = 0; // No need to set whole array to NULL. gsDest[0] = 0; // No need to set whole array to NULL.
@ -630,7 +629,7 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
wxString title = templates.TitleTemplate; wxString title = templates.TitleTemplate;
title.Replace(L"${slot}", pxsFmt(L"%d", States_GetCurrentSlot())); title.Replace(L"${slot}", pxsFmt(L"%d", States_GetCurrentSlot()));
title.Replace(L"${limiter}", limiterStr); title.Replace(L"${limiter}", limiterStr);
title.Replace(L"${speed}", pxsFmt(L"%3d%%", lround(per))); title.Replace(L"${speed}", pxsFmt(L"%3d%%", lround(percentage)));
title.Replace(L"${vfps}", pxsFmt(L"%.02f", fps)); title.Replace(L"${vfps}", pxsFmt(L"%.02f", fps));
title.Replace(L"${cpuusage}", cpuUsage); title.Replace(L"${cpuusage}", cpuUsage);
title.Replace(L"${omodef}", omodef); title.Replace(L"${omodef}", omodef);