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

Merge pull request #1046 from ssakash/GSDX_mode 

PCSX2: Fix up Video mode detection on GS Frame
This commit is contained in:
ramapcsx2 2015-12-20 13:05:12 +01:00
parent 279fc2ac79 0f1fec40cf
commit c73f87ac71
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/AppConfig.cpp
View File

@ -939,7 +939,7 @@ AppConfig::UiTemplateOptions::UiTemplateOptions()
OutputField = L"Field"; OutputField = L"Field";
OutputProgressive = L"Progressive"; OutputProgressive = L"Progressive";
OutputInterlaced = L"Interlaced"; OutputInterlaced = L"Interlaced";
TitleTemplate = L"Slot: ${slot} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} | ${gsdx} | ${omodec} | ${cpuusage}"; TitleTemplate = L"Slot: ${slot} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} | ${gsdx} | ${omodei} | ${cpuusage}";
} }
void AppConfig::UiTemplateOptions::LoadSave(IniInterface& ini) void AppConfig::UiTemplateOptions::LoadSave(IniInterface& ini)

5
pcsx2/gui/FrameForGS.cpp
View File

@ -587,14 +587,12 @@ 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.GetGuiPct());) 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()));
@ -604,7 +602,6 @@ 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);