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

UI: Hide Synchronous GS in release builds (#4838) 

UI: make ' Synchronized MTGS'  UI settings exclusive to debug/devel
This commit is contained in:
Mrlinkwii 2021-09-28 12:11:12 +01:00 committed by GitHub
parent 21c6bb6b59
commit 48eee328b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Pcsx2Config.cpp
View File

@ -221,7 +221,9 @@ void Pcsx2Config::GSOptions::LoadSave( IniInterface& ini )
{ {
ScopedIniGroup path( ini, L"GS" ); ScopedIniGroup path( ini, L"GS" );
#ifdef PCSX2_DEVBUILD
IniEntry( SynchronousMTGS ); IniEntry( SynchronousMTGS );
#endif
IniEntry( VsyncQueueSize ); IniEntry( VsyncQueueSize );
IniEntry( FrameLimitEnable ); IniEntry( FrameLimitEnable );

15
pcsx2/gui/Panels/VideoPanel.cpp
View File

@ -285,10 +285,11 @@ Panels::VideoPanel::VideoPanel( wxWindow* parent ) :
{ {
wxPanelWithHelpers* left = new wxPanelWithHelpers( this, wxVERTICAL ); wxPanelWithHelpers* left = new wxPanelWithHelpers( this, wxVERTICAL );
wxPanelWithHelpers* right = new wxPanelWithHelpers( this, wxVERTICAL ); wxPanelWithHelpers* right = new wxPanelWithHelpers( this, wxVERTICAL );
#ifdef PCSX2_DEVBUILD
m_check_SynchronousGS = new pxCheckBox( left, _("Use Synchronized MTGS"), m_check_SynchronousGS = new pxCheckBox( left, _("Use Synchronized MTGS"),
_t("For troubleshooting potential bugs in the MTGS only, as it is potentially very slow.") _t("For troubleshooting potential bugs in the MTGS only, as it is potentially very slow.")
); );
#endif
m_spinner_VsyncQueue = new wxSpinCtrl(left); m_spinner_VsyncQueue = new wxSpinCtrl(left);
m_spinner_VsyncQueue->SetRange(0, 3); m_spinner_VsyncQueue->SetRange(0, 3);
@ -296,7 +297,9 @@ Panels::VideoPanel::VideoPanel( wxWindow* parent ) :
m_restore_defaults = new wxButton(right, wxID_DEFAULT, _("Restore Defaults")); m_restore_defaults = new wxButton(right, wxID_DEFAULT, _("Restore Defaults"));
m_spinner_VsyncQueue->SetToolTip( pxEt(L"Setting this to a lower value improves input lag, a value around 2 or 3 will slightly improve framerates. (Default is 2)")); m_spinner_VsyncQueue->SetToolTip( pxEt(L"Setting this to a lower value improves input lag, a value around 2 or 3 will slightly improve framerates. (Default is 2)"));
#ifdef PCSX2_DEVBUILD
m_check_SynchronousGS->SetToolTip( pxEt( L"Enable this if you think MTGS thread sync is causing crashes or graphical errors. For debugging to see if GS is running at the correct speed.")); m_check_SynchronousGS->SetToolTip( pxEt( L"Enable this if you think MTGS thread sync is causing crashes or graphical errors. For debugging to see if GS is running at the correct speed."));
#endif
//GSWindowSettingsPanel* winpan = new GSWindowSettingsPanel( left ); //GSWindowSettingsPanel* winpan = new GSWindowSettingsPanel( left );
//winpan->AddFrame(_("Display/Window")); //winpan->AddFrame(_("Display/Window"));
@ -322,8 +325,10 @@ Panels::VideoPanel::VideoPanel( wxWindow* parent ) :
*s_vsyncs += Label(_("Vsyncs in MTGS Queue:")) | StdExpand(); *s_vsyncs += Label(_("Vsyncs in MTGS Queue:")) | StdExpand();
*s_vsyncs += m_spinner_VsyncQueue | pxBorder(wxTOP, -2).Right(); *s_vsyncs += m_spinner_VsyncQueue | pxBorder(wxTOP, -2).Right();
*left += s_vsyncs | StdExpand(); *left += s_vsyncs | StdExpand();
#ifdef PCSX2_DEVBUILD
*left += 2; *left += 2;
*left += m_check_SynchronousGS | StdExpand(); *left += m_check_SynchronousGS | StdExpand();
#endif
*s_table += left | StdExpand(); *s_table += left | StdExpand();
*s_table += right | StdExpand(); *s_table += right | StdExpand();
@ -354,7 +359,9 @@ void Panels::VideoPanel::OnOpenWindowSettings( wxCommandEvent& evt )
void Panels::VideoPanel::Apply() void Panels::VideoPanel::Apply()
{ {
#ifdef PCSX2_DEVBUILD
g_Conf->EmuOptions.GS.SynchronousMTGS = m_check_SynchronousGS->GetValue(); g_Conf->EmuOptions.GS.SynchronousMTGS = m_check_SynchronousGS->GetValue();
#endif
g_Conf->EmuOptions.GS.VsyncQueueSize = m_spinner_VsyncQueue->GetValue(); g_Conf->EmuOptions.GS.VsyncQueueSize = m_spinner_VsyncQueue->GetValue();
} }
@ -364,10 +371,12 @@ void Panels::VideoPanel::AppStatusEvent_OnSettingsApplied()
} }
void Panels::VideoPanel::ApplyConfigToGui( AppConfig& configToApply, int flags ){ void Panels::VideoPanel::ApplyConfigToGui( AppConfig& configToApply, int flags ){
#ifdef PCSX2_DEVBUILD
m_check_SynchronousGS->SetValue( configToApply.EmuOptions.GS.SynchronousMTGS ); m_check_SynchronousGS->SetValue( configToApply.EmuOptions.GS.SynchronousMTGS );
m_spinner_VsyncQueue->SetValue( configToApply.EmuOptions.GS.VsyncQueueSize );
m_check_SynchronousGS->Enable(!configToApply.EnablePresets); m_check_SynchronousGS->Enable(!configToApply.EnablePresets);
#endif
m_spinner_VsyncQueue->SetValue( configToApply.EmuOptions.GS.VsyncQueueSize );
if( flags & AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE ) if( flags & AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE )
{ {