diff --git a/pcsx2/Config.h b/pcsx2/Config.h index fd7964f2a6..1eeddf48e1 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -373,8 +373,7 @@ struct Pcsx2Config IntcStat :1, // tells Pcsx2 to fast-forward through intc_stat waits. WaitLoop :1, // enables constant loop detection and fast-forwarding vuFlagHack :1, // microVU specific flag hack - vuBlockHack :1, // microVU specific block flag no-propagation hack - vuMinMax :1; // microVU specific MinMax hack + vuBlockHack :1; // microVU specific block flag no-propagation hack BITFIELD_END u8 EECycleRate; // EE cycle rate selector (1.0, 1.5, 2.0) diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index d2a9d9a74f..0402d37fe8 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -64,7 +64,6 @@ void Pcsx2Config::SpeedhackOptions::LoadSave( IniInterface& ini ) IniBitBool( WaitLoop ); IniBitBool( vuFlagHack ); IniBitBool( vuBlockHack ); - IniBitBool( vuMinMax ); } void Pcsx2Config::ProfilerOptions::LoadSave( IniInterface& ini ) diff --git a/pcsx2/gui/Panels/ConfigurationPanels.h b/pcsx2/gui/Panels/ConfigurationPanels.h index 7c221f98a7..43e66d86f2 100644 --- a/pcsx2/gui/Panels/ConfigurationPanels.h +++ b/pcsx2/gui/Panels/ConfigurationPanels.h @@ -333,7 +333,6 @@ namespace Panels pxCheckBox* m_check_fastCDVD; pxCheckBox* m_check_vuFlagHack; pxCheckBox* m_check_vuBlockHack; - pxCheckBox* m_check_vuMinMax; public: virtual ~SpeedHacksPanel() throw() {} diff --git a/pcsx2/gui/Panels/SpeedhacksPanel.cpp b/pcsx2/gui/Panels/SpeedhacksPanel.cpp index 62d0b15281..f6a37e1aae 100644 --- a/pcsx2/gui/Panels/SpeedhacksPanel.cpp +++ b/pcsx2/gui/Panels/SpeedhacksPanel.cpp @@ -166,9 +166,6 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) m_check_vuBlockHack = new pxCheckBox( vuHacksPanel, _("mVU Block Hack"), _("Good Speedup and High Compatibility; may cause garbage graphics, SPS, etc...") ); - m_check_vuMinMax = new pxCheckBox( vuHacksPanel, _("mVU Min/Max Hack"), - _("Small Speedup; may cause black screens, garbage graphics, SPS, etc... [Not Recommended]") ); - m_check_vuFlagHack->SetToolTip( pxEt( "!ContextTip:Speedhacks:vuFlagHack", L"Updates Status Flags only on blocks which will read them, instead of all the time. " L"This is safe most of the time, and Super VU does something similar by default." @@ -179,11 +176,6 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) L"This should be pretty safe. It is unknown if this breaks any game..." ) ); - m_check_vuMinMax->SetToolTip( pxEt( "!ContextTip:Speedhacks:vuMinMax", - L"Uses SSE's Min/Max Floating Point Operations instead of custom logical Min/Max routines. " - L"Known to break Gran Turismo 4, Tekken 5." - ) ); - // ------------------------------------------------------------------------ // All other hacks Section: @@ -234,7 +226,7 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) *vuHacksPanel += m_check_vuFlagHack; *vuHacksPanel += m_check_vuBlockHack; - *vuHacksPanel += m_check_vuMinMax; + *vuHacksPanel += 57; // Aligns left and right boxes in default language and font size *miscHacksPanel += m_check_intc; *miscHacksPanel += m_check_waitloop; @@ -312,7 +304,6 @@ void Panels::SpeedHacksPanel::ApplyConfigToGui( AppConfig& configToApply, int fl m_check_vuFlagHack ->SetValue(opts.vuFlagHack); m_check_vuBlockHack ->SetValue(opts.vuBlockHack); - m_check_vuMinMax ->SetValue(opts.vuMinMax); m_check_intc ->SetValue(opts.IntcStat); m_check_waitloop ->SetValue(opts.WaitLoop); m_check_fastCDVD ->SetValue(opts.fastCDVD); @@ -342,7 +333,6 @@ void Panels::SpeedHacksPanel::Apply() opts.IntcStat = m_check_intc->GetValue(); opts.vuFlagHack = m_check_vuFlagHack->GetValue(); opts.vuBlockHack = m_check_vuBlockHack->GetValue(); - opts.vuMinMax = m_check_vuMinMax->GetValue(); // If the user has a command line override specified, we need to disable it // so that their changes take effect diff --git a/pcsx2/x86/microVU_Misc.h b/pcsx2/x86/microVU_Misc.h index a9757478bc..8d50fbbb05 100644 --- a/pcsx2/x86/microVU_Misc.h +++ b/pcsx2/x86/microVU_Misc.h @@ -312,7 +312,7 @@ static const bool doJumpCaching = 1; // Set to 1 to enable jump caching // of end-of-block flag instance shuffling, causing nice speedups. // Min/Max Speed Hack -#define CHECK_VU_MINMAXHACK (EmuConfig.Speedhacks.vuMinMax) +#define CHECK_VU_MINMAXHACK 0 //(EmuConfig.Speedhacks.vuMinMax) // This hack uses SSE min/max instructions instead of emulated "logical min/max" // The PS2 does not consider denormals as zero on the mini/max opcodes. // This speedup is minor, but on AMD X2 CPUs it can be a 1~3% speedup