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

GSdx OSD: Minor log improvements

This commit is contained in:
FlatOutPS2 2017-01-03 20:32:10 +01:00 committed by Jonathan Li
parent 83b5bdbd29
commit d42759c641
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcsx2/gui/FrameForGS.cpp
View File

@ -587,14 +587,24 @@ GSPanel* GSFrame::GetViewport()
void GSFrame::OnUpdateTitle( wxTimerEvent& evt ) void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
{ {
double fps = wxGetApp().FpsManager.GetFramerate();
OSDmonitor(Color_StrongGreen, "EE:", std::to_string(m_CpuUsage.GetEEcorePct()).c_str());
OSDmonitor(Color_StrongGreen, "GS:", std::to_string(m_CpuUsage.GetGsPct()).c_str());
OSDmonitor(Color_StrongGreen, "UI:", std::to_string(m_CpuUsage.GetGuiPct()).c_str());
std::ostringstream out;
out << std::fixed << std::setprecision(2) << fps;
OSDmonitor(Color_StrongGreen, "FPS:", out.str());
#ifdef __linux__ #ifdef __linux__
// Important Linux note: When the title is set in fullscreen the window is redrawn. Unfortunately // Important Linux note: When the title is set in fullscreen the window is redrawn. Unfortunately
// an intermediate white screen appears too which leads to a very annoying flickering. // an intermediate white screen appears too which leads to a very annoying flickering.
if (IsFullScreen()) return; if (IsFullScreen()) return;
#endif #endif
AppConfig::UiTemplateOptions& templates = g_Conf->Templates; AppConfig::UiTemplateOptions& templates = g_Conf->Templates;
double fps = wxGetApp().FpsManager.GetFramerate();
float percentage = (fps * 100) / GetVerticalFrequency().ToFloat(); float percentage = (fps * 100) / GetVerticalFrequency().ToFloat();
char gsDest[128]; char gsDest[128];
@ -618,15 +628,12 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
m_CpuUsage.UpdateStats(); m_CpuUsage.UpdateStats();
cpuUsage.Write(L"EE: %3d%%", m_CpuUsage.GetEEcorePct()); cpuUsage.Write(L"EE: %3d%%", m_CpuUsage.GetEEcorePct());
OSDmonitor(Color_StrongRed, "EE", std::to_string(m_CpuUsage.GetEEcorePct()).c_str());
cpuUsage.Write(L" | GS: %3d%%", m_CpuUsage.GetGsPct()); cpuUsage.Write(L" | GS: %3d%%", m_CpuUsage.GetGsPct());
OSDmonitor(Color_StrongGreen, "GS", std::to_string(m_CpuUsage.GetGsPct()).c_str());
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.GetGuiPct())); pxNonReleaseCode(cpuUsage.Write(L" | UI: %3d%%", m_CpuUsage.GetGuiPct()));
OSDmonitor(Color_StrongYellow, "UI", std::to_string(m_CpuUsage.GetGuiPct()).c_str());
} }
const u64& smode2 = *(u64*)PS2GS_BASE(GS_SMODE2); const u64& smode2 = *(u64*)PS2GS_BASE(GS_SMODE2);
@ -638,9 +645,6 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
title.Replace(L"${limiter}", limiterStr); title.Replace(L"${limiter}", limiterStr);
title.Replace(L"${speed}", pxsFmt(L"%3d%%", lround(percentage))); 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));
std::ostringstream out;
out << std::fixed << std::setprecision(2) << fps;
OSDmonitor(Color_StrongBlue, "FPS", out.str());
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);

8
pcsx2/gui/GlobalCommands.cpp
View File

@ -180,13 +180,13 @@ namespace Implementations
art = AspectRatio_4_3; art = AspectRatio_4_3;
switch( art ) switch( art )
{ {
case AspectRatio_Stretch: art = AspectRatio_4_3; arts = "AspectRatio_4_3"; break; case AspectRatio_Stretch: art = AspectRatio_4_3; arts = "4:3"; break;
case AspectRatio_4_3: art = AspectRatio_16_9; arts = "AspectRatio_16:9"; break; case AspectRatio_4_3: art = AspectRatio_16_9; arts = "16:9"; break;
case AspectRatio_16_9: art = AspectRatio_Stretch; arts = "AspectRatio_Stretch";break; case AspectRatio_16_9: art = AspectRatio_Stretch; arts = "Stretch"; break;
default: break; default: break;
} }
OSDlog( Color_StrongBlue, true, "(GSwindow) Aspect ratio: %s.", arts ); OSDlog(Color_StrongBlue, true, "(GSwindow) Aspect ratio: %s", arts);
UpdateImagePosition(); UpdateImagePosition();
} }

2
pcsx2/gui/SysState.cpp
View File

@ -686,7 +686,7 @@ void StateCopy_LoadFromSlot( uint slot, bool isFromBackup )
if( !wxFileExists( file ) ) if( !wxFileExists( file ) )
{ {
Console.Warning( L"Savestate slot %d%s is empty.", slot, isFromBackup?L" (backup)":L"" ); OSDlog(Color_StrongGreen, true, "Savestate slot %d%s is empty.", slot, isFromBackup ? " (backup)" : "");
return; return;
} }