From da3c3a828cc117bbddb5739ccc960ce3906945b0 Mon Sep 17 00:00:00 2001 From: Kojin Date: Fri, 9 Oct 2020 17:19:17 -0400 Subject: [PATCH] pcsx2: purge fmv in sw hack (#3806) * pcsx2: purge fmv in sw hack * gamedb: remove mention of fmv in sw hack --- bin/GameIndex.dbf | 1 - pcsx2/Config.h | 4 +--- pcsx2/IPU/IPU.cpp | 2 +- pcsx2/Pcsx2Config.cpp | 4 ---- pcsx2/gui/AppMain.cpp | 8 +------- pcsx2/gui/FrameForGS.cpp | 2 -- pcsx2/gui/Panels/GameFixesPanel.cpp | 4 ---- 7 files changed, 3 insertions(+), 22 deletions(-) diff --git a/bin/GameIndex.dbf b/bin/GameIndex.dbf index 335f4a43f4d04..d78efb8725a43 100644 --- a/bin/GameIndex.dbf +++ b/bin/GameIndex.dbf @@ -68,7 +68,6 @@ -- VIFFIFOHack = 1 // Transformers Armada, Test Drive Unlimited. Fixes slow booting issue. -- VIF1StallHack = 1 // SOCOM II HUD and Spy Hunter loading hang. -- GIFFIFOHack = 1 // Enables the GIF FIFO. Needed for Wallace & Grommit, Hot Wheels, DJ Hero. --- FMVinSoftwareHack = 1 // Silent Hill 2-3. Fixes FMVs that are obscured when using hardware rendering by switching to software rendering while an FMV plays. -- ScarfaceIbitHack = 1 // VU I bit Hack avoid constant recompilation (Scarface The World Is Yours). -- CrashTagTeamRacingIbit = 1 // VU I bit Hack avoid constant recompilation (Crash Tag Team Racing). -- VU0KickstartHack = 1 // Let VU0 run ahead to fix some timing issues diff --git a/pcsx2/Config.h b/pcsx2/Config.h index 1bfd034948b0c..6c61e6419eb19 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -52,7 +52,6 @@ enum GamefixId Fix_VIFFIFO, Fix_VIF1Stall, Fix_GIFFIFO, - Fix_FMVinSoftware, Fix_GoemonTlbMiss, Fix_ScarfaceIbit, Fix_CrashTagTeamIbit, @@ -356,7 +355,6 @@ struct Pcsx2Config VIFFIFOHack : 1, // Pretends to fill the non-existant VIF FIFO Buffer. VIF1StallHack : 1, // Like above, processes FIFO data before the stall is allowed (to make sure data goes over). GIFFIFOHack : 1, // Enabled the GIF FIFO (more correct but slower) - FMVinSoftwareHack : 1, // Toggle in and out of software rendering when an FMV runs. GoemonTlbHack : 1, // Gomeon tlb miss hack. The game need to access unmapped virtual address. Instead to handle it as exception, tlb are preloaded at startup ScarfaceIbit : 1, // Scarface I bit hack. Needed to stop constant VU recompilation CrashTagTeamRacingIbit : 1, // Crash Tag Team Racing I bit hack. Needed to stop constant VU recompilation @@ -546,7 +544,7 @@ TraceLogFilters& SetTraceConfig(); #define CHECK_VIFFIFOHACK (EmuConfig.Gamefixes.VIFFIFOHack) // Pretends to fill the non-existant VIF FIFO Buffer. #define CHECK_VIF1STALLHACK (EmuConfig.Gamefixes.VIF1StallHack) // Like above, processes FIFO data before the stall is allowed (to make sure data goes over). #define CHECK_GIFFIFOHACK (EmuConfig.Gamefixes.GIFFIFOHack) // Enabled the GIF FIFO (more correct but slower) -#define CHECK_FMVINSOFTWAREHACK (EmuConfig.Gamefixes.FMVinSoftwareHack) // Toggle in and out of software rendering when an FMV runs. + //------------ Advanced Options!!! --------------- #define CHECK_VU_OVERFLOW (EmuConfig.Cpu.Recompiler.vuOverflow) #define CHECK_VU_EXTRA_OVERFLOW (EmuConfig.Cpu.Recompiler.vuExtraOverflow) // If enabled, Operands are clamped before being used in the VU recs diff --git a/pcsx2/IPU/IPU.cpp b/pcsx2/IPU/IPU.cpp index eaaa162330e4c..d00b064a6ab7b 100644 --- a/pcsx2/IPU/IPU.cpp +++ b/pcsx2/IPU/IPU.cpp @@ -409,7 +409,7 @@ static __ri void ipuBDEC(tIPU_CMD_BDEC bdec) static __fi bool ipuVDEC(u32 val) { - if (EmuConfig.Gamefixes.FMVinSoftwareHack || g_Conf->GSWindow.FMVAspectRatioSwitch != FMV_AspectRatio_Switch_Off) { + if (g_Conf->GSWindow.FMVAspectRatioSwitch != FMV_AspectRatio_Switch_Off) { static int count = 0; if (count++ > 5) { if (!FMVstarted) { diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index dd53674b85df9..1b24e23cac8ee 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -264,7 +264,6 @@ const wxChar *const tbl_GamefixNames[] = L"VIFFIFO", L"VIF1Stall", L"GIFFIFO", - L"FMVinSoftware", L"GoemonTlb", L"ScarfaceIbit", L"CrashTagTeamRacingIbit", @@ -328,7 +327,6 @@ void Pcsx2Config::GamefixOptions::Set( GamefixId id, bool enabled ) case Fix_VIFFIFO: VIFFIFOHack = enabled; break; case Fix_VIF1Stall: VIF1StallHack = enabled; break; case Fix_GIFFIFO: GIFFIFOHack = enabled; break; - case Fix_FMVinSoftware: FMVinSoftwareHack = enabled; break; case Fix_GoemonTlbMiss: GoemonTlbHack = enabled; break; case Fix_ScarfaceIbit: ScarfaceIbit = enabled; break; case Fix_CrashTagTeamIbit: CrashTagTeamRacingIbit = enabled; break; @@ -355,7 +353,6 @@ bool Pcsx2Config::GamefixOptions::Get( GamefixId id ) const case Fix_VIFFIFO: return VIFFIFOHack; case Fix_VIF1Stall: return VIF1StallHack; case Fix_GIFFIFO: return GIFFIFOHack; - case Fix_FMVinSoftware: return FMVinSoftwareHack; case Fix_GoemonTlbMiss: return GoemonTlbHack; case Fix_ScarfaceIbit: return ScarfaceIbit; case Fix_CrashTagTeamIbit: return CrashTagTeamRacingIbit; @@ -382,7 +379,6 @@ void Pcsx2Config::GamefixOptions::LoadSave( IniInterface& ini ) IniBitBool( VIFFIFOHack ); IniBitBool( VIF1StallHack ); IniBitBool( GIFFIFOHack ); - IniBitBool( FMVinSoftwareHack ); IniBitBool( GoemonTlbHack ); IniBitBool( ScarfaceIbit ); IniBitBool( CrashTagTeamRacingIbit ); diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index 9110a3bd0f537..ec1281e509ffb 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -534,12 +534,6 @@ void DoFmvSwitch(bool on) if (GSPanel* viewport = gsFrame->GetViewport()) viewport->DoResize(); } - - if (EmuConfig.Gamefixes.FMVinSoftwareHack) { - ScopedCoreThreadPause paused_core(new SysExecEvent_SaveSinglePlugin(PluginId_GS)); - renderswitch = !renderswitch; - paused_core.AllowResume(); - } } void Pcsx2App::LogicalVsync() @@ -552,7 +546,7 @@ void Pcsx2App::LogicalVsync() FpsManager.DoFrame(); - if (EmuConfig.Gamefixes.FMVinSoftwareHack || g_Conf->GSWindow.FMVAspectRatioSwitch != FMV_AspectRatio_Switch_Off) { + if (g_Conf->GSWindow.FMVAspectRatioSwitch != FMV_AspectRatio_Switch_Off) { if (EnableFMV) { DevCon.Warning("FMV on"); DoFmvSwitch(true); diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp index 3d8c46993256d..77117cf29962c 100644 --- a/pcsx2/gui/FrameForGS.cpp +++ b/pcsx2/gui/FrameForGS.cpp @@ -274,8 +274,6 @@ void GSPanel::DoResize() zoom = std::max( (float)arr, (float)(1.0/arr) ); viewport.Scale(zoom, zoom*g_Conf->GSWindow.StretchY.ToFloat()/100.0 ); - if (viewport == client && EmuConfig.Gamefixes.FMVinSoftwareHack && g_Conf->GSWindow.IsFullscreen) - viewport.x += 1; //avoids crash on some systems switching HW>