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

Merge pull request #206 from ramapcsx2/hackremoval1 

PCSX2: Removed the "managed VSync" option. I don't think it saw much use
This commit is contained in:
ramapcsx2 2014-08-13 11:27:33 +02:00
parent c46749f236 9c58537078
commit b6e0ed43de
7 changed files with 2 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Config.h
View File

@ -285,7 +285,6 @@ struct Pcsx2Config
bool FrameLimitEnable;
bool FrameSkipEnable;
bool VsyncEnable;
bool ManagedVsync;
// The region mode controls the default Maximum/Minimum FPS settings and also
// regulates the vsync rates (which in turn control the IOP's SPU2 tick sync and ensure
@ -312,7 +311,6 @@ struct Pcsx2Config
OpEqu( FrameSkipEnable ) &&
OpEqu( FrameLimitEnable ) &&
OpEqu( VsyncEnable ) &&
OpEqu( ManagedVsync ) &&
OpEqu( LimitScalar ) &&
OpEqu( FramerateNTSC ) &&

2
pcsx2/MTGS.cpp
View File

@ -196,7 +196,7 @@ void SysMtgsThread::OpenPlugin()
if( renderswitch )
{
Console.Indent(2).WriteLn( "Forced software switch enabled." );
if (EmuConfig.GS.VsyncEnable && !EmuConfig.GS.ManagedVsync)
if ( EmuConfig.GS.VsyncEnable )
{
// Better turn Vsync off now, as in most cases sw rendering is not fast enough to support a steady 60fps.
// Having Vsync still enabled then means a big cut in speed and sloppy rendering.

2
pcsx2/Pcsx2Config.cpp
View File

@ -201,7 +201,6 @@ Pcsx2Config::GSOptions::GSOptions()
FrameLimitEnable = true;
FrameSkipEnable = false;
VsyncEnable = false;
ManagedVsync = false;
SynchronousMTGS = false;
DisableOutput = false;
@ -227,7 +226,6 @@ void Pcsx2Config::GSOptions::LoadSave( IniInterface& ini )
IniEntry( FrameLimitEnable );
IniEntry( FrameSkipEnable );
IniEntry( VsyncEnable );
IniEntry( ManagedVsync );
IniEntry( LimitScalar );
IniEntry( FramerateNTSC );

3
pcsx2/gui/AppConfig.cpp
View File

@ -948,7 +948,7 @@ bool AppConfig::IsOkApplyPreset(int n)
// 2. The panels should not apply values which the presets don't control if the value is initiated by a preset.
// Currently controlled by the presets:
// - AppConfig: Framerate (except turbo/slowmo factors), EnableSpeedHacks, EnableGameFixes.
// - EmuOptions: Cpu, Gamefixes, SpeedHacks (except mtvu), EnablePatches, GS (except for FrameLimitEnable, VsyncEnable and ManagedVsync).
// - EmuOptions: Cpu, Gamefixes, SpeedHacks (except mtvu), EnablePatches, GS (except for FrameLimitEnable and VsyncEnable).
//
// This essentially currently covers all the options on all the panels except for framelimiter which isn't
// controlled by the presets, and the entire GSWindow panel which also isn't controlled by presets
@ -970,7 +970,6 @@ bool AppConfig::IsOkApplyPreset(int n)
EmuOptions.GS = default_Pcsx2Config.GS;
EmuOptions.GS.FrameLimitEnable = original_GS.FrameLimitEnable; //Frame limiter is not modified by presets
//EmuOptions.GS.VsyncEnable = original_GS.VsyncEnable;
//EmuOptions.GS.ManagedVsync = original_GS.ManagedVsync;
EmuOptions.Cpu = default_Pcsx2Config.Cpu;
EmuOptions.Gamefixes = default_Pcsx2Config.Gamefixes;

61
pcsx2/gui/AppMain.cpp
View File

@ -487,67 +487,6 @@ void Pcsx2App::LogicalVsync()
}
}
if (EmuConfig.GS.ManagedVsync && EmuConfig.GS.VsyncEnable)
{
static bool last_enabled = true; // Avoids locking it in some scenarios
static int too_slow = 0;
static int fast_enough = 0;
if ( g_LimiterMode == Limit_Nominal && EmuConfig.GS.VsyncEnable && g_Conf->EmuOptions.GS.FrameLimitEnable )
{
float fps = (float)FpsManager.GetFramerate();
if( gsRegionMode == Region_NTSC )
{
if (fps < 59.0f ) {
too_slow++;
fast_enough = 0;
if (too_slow > 4 && last_enabled == true)
{
last_enabled = false;
GSsetVsync( 0 );
}
}
else {
fast_enough++;
too_slow = 0;
if (fast_enough > 12 && last_enabled == false)
{
last_enabled = true;
GSsetVsync( 1 );
}
}
}
else
{
if (fps < 49.2f ) {
too_slow++;
fast_enough = 0;
if (too_slow > 3 && last_enabled == true)
{
last_enabled = false;
GSsetVsync( 0 );
}
}
else {
fast_enough++;
too_slow = 0;
if (fast_enough > 15 && last_enabled == false)
{
last_enabled = true;
GSsetVsync( 1 );
}
}
}
}
else
{
last_enabled = true; // Avoids locking it in some scenarios
too_slow = 0;
fast_enough = 0;
GSsetVsync( 0 );
}
}
// Only call PADupdate here if we're using GSopen2. Legacy GSopen plugins have the
// GS window belonging to the MTGS thread.
if( (PADupdate != NULL) && (GSopen2 != NULL) && (wxGetApp().GetGsFramePtr() != NULL) )

1
pcsx2/gui/Panels/ConfigurationPanels.h
View File

@ -269,7 +269,6 @@ namespace Panels
pxCheckBox* m_check_CloseGS;
pxCheckBox* m_check_SizeLock;
pxCheckBox* m_check_VsyncEnable;
pxCheckBox* m_check_ManagedVsync;
pxCheckBox* m_check_Fullscreen;
//Exclusive mode is currently not used (true for svn r4399).

9
pcsx2/gui/Panels/GSWindowPanel.cpp
View File

@ -48,7 +48,6 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent )
m_check_CloseGS = new pxCheckBox( this, _("Hide window when paused") );
m_check_Fullscreen = new pxCheckBox( this, _("Default to fullscreen mode on open") );
m_check_VsyncEnable = new pxCheckBox( this, _("Wait for Vsync on refresh") );
m_check_ManagedVsync = new pxCheckBox( this, _("Dynamically toggle Vsync depending on frame rate (read tooltip!)") );
m_check_DclickFullscreen = new pxCheckBox( this, _("Double-click toggles fullscreen mode") );
//m_check_ExclusiveFS = new pxCheckBox( this, _("Use exclusive fullscreen mode (if available)") );
@ -57,9 +56,6 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent )
m_check_VsyncEnable->SetToolTip( pxEt( L"Vsync eliminates screen tearing but typically has a big performance hit. It usually only applies to fullscreen mode, and may not work with all GS plugins."
) );
m_check_ManagedVsync->SetToolTip( pxEt( L"Enables Vsync when the framerate is exactly at full speed. Should it fall below that, Vsync gets disabled to avoid further performance penalties. Note: This currently only works well with GSdx as GS plugin and with it configured to use DX10/11 hardware rendering. Any other plugin or rendering mode will either ignore it or produce a black frame that blinks whenever the mode switches. It also requires Vsync to be enabled."
) );
m_check_HideMouse->SetToolTip( pxEt( L"Check this to force the mouse cursor invisible inside the GS window; useful if using the mouse as a primary control device for gaming. By default the mouse auto-hides after 2 seconds of inactivity."
) );
@ -108,7 +104,6 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent )
*this += new wxStaticLine( this ) | StdExpand();
*this += m_check_VsyncEnable;
*this += m_check_ManagedVsync;
wxBoxSizer* centerSizer = new wxBoxSizer( wxVERTICAL );
*centerSizer += GetSizer() | pxCenter;
@ -144,9 +139,6 @@ void Panels::GSWindowSettingsPanel::ApplyConfigToGui( AppConfig& configToApply,
m_check_VsyncEnable->SetValue( configToApply.EmuOptions.GS.VsyncEnable );
m_check_VsyncEnable->Enable ( !configToApply.EnablePresets );//grayed-out when presets are enabled
m_check_ManagedVsync->SetValue( configToApply.EmuOptions.GS.ManagedVsync );
m_check_ManagedVsync->Enable ( !configToApply.EnablePresets );//grayed-out when presets are enabled
}
void Panels::GSWindowSettingsPanel::Apply()
@ -163,7 +155,6 @@ void Panels::GSWindowSettingsPanel::Apply()
appconf.Zoom = Fixed100::FromString( m_text_Zoom->GetValue() );
gsconf.VsyncEnable = m_check_VsyncEnable->GetValue();
gsconf.ManagedVsync = m_check_ManagedVsync->GetValue();
appconf.IsToggleFullscreenOnDoubleClick = m_check_DclickFullscreen->GetValue();