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

GS-Wnd: Fix UI to show UI percentage. Set defaults for the title bar. Add a sort of lie mode omodec, which says you are using progressive when Interlace(Field) is active as this most isn't technically interlaced but actually half FPS, see this comment https://github.com/PCSX2/pcsx2/issues/832#issuecomment-141248883

This commit is contained in:
refractionpcsx2 2015-10-12 21:19:56 +01:00
parent b3d9feb1f2
commit 4560620210
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcsx2/gui/AppConfig.cpp
View File

@ -931,15 +931,15 @@ void AppConfig::FramerateOptions::LoadSave( IniInterface& ini )
AppConfig::UiTemplateOptions::UiTemplateOptions() AppConfig::UiTemplateOptions::UiTemplateOptions()
{ {
LimiterUnlimited = L"-unlimited"; LimiterUnlimited = L"Max";
LimiterTurbo = L"-turbo"; LimiterTurbo = L"Turbo";
LimiterSlowmo = L"-slowmo"; LimiterSlowmo = L"Slowmo";
LimiterNormal = L""; LimiterNormal = L"Normal";
OutputFrame = L"frame"; OutputFrame = L"Frame";
OutputField = L"field"; OutputField = L"Field";
OutputProgressive = L"p"; OutputProgressive = L"Progressive";
OutputInterlaced = L"i"; OutputInterlaced = L"Interlaced";
TitleTemplate = L"Slot: ${slot} | Speed${limiter}: ${speed} (${vfps}) | ${cpuusage} | ${omodef}-${omodei} | ${gsdx}"; TitleTemplate = L"Slot: ${slot} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} | ${gsdx} | ${omodec} | ${cpuusage}";
} }
void AppConfig::UiTemplateOptions::LoadSave(IniInterface& ini) void AppConfig::UiTemplateOptions::LoadSave(IniInterface& ini)

5
pcsx2/gui/FrameForGS.cpp
View File

@ -587,12 +587,14 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
if (THREAD_VU1) if (THREAD_VU1)
cpuUsage.Write(L" | VU: %3d%%", m_CpuUsage.GetVUPct()); cpuUsage.Write(L" | VU: %3d%%", m_CpuUsage.GetVUPct());
pxNonReleaseCode(cpuUsage.Write(L" | UI: %3d%%", m_CpuUsage.GetEEcorePct());) pxNonReleaseCode(cpuUsage.Write(L" | UI: %3d%%", m_CpuUsage.GetGuiPct());)
} }
const u64& smode2 = *(u64*)PS2GS_BASE(GS_SMODE2); const u64& smode2 = *(u64*)PS2GS_BASE(GS_SMODE2);
wxString omodef = (smode2 & 2) ? templates.OutputFrame : templates.OutputField; wxString omodef = (smode2 & 2) ? templates.OutputFrame : templates.OutputField;
wxString omodei = (smode2 & 1) ? templates.OutputInterlaced : templates.OutputProgressive; wxString omodei = (smode2 & 1) ? templates.OutputInterlaced : templates.OutputProgressive;
//This is a lie, but Field mode is essentially not interlaced, will probably be 1/2 FPS
wxString omodec = ((smode2 & 3) == 1) ? templates.OutputProgressive : omodei;
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()));
@ -602,6 +604,7 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
title.Replace(L"${cpuusage}", cpuUsage); title.Replace(L"${cpuusage}", cpuUsage);
title.Replace(L"${omodef}", omodef); title.Replace(L"${omodef}", omodef);
title.Replace(L"${omodei}", omodei); title.Replace(L"${omodei}", omodei);
title.Replace(L"${omodec}", omodec);
title.Replace(L"${gsdx}", fromUTF8(gsDest)); title.Replace(L"${gsdx}", fromUTF8(gsDest));
SetTitle(title); SetTitle(title);