From a30ca0ce2a525ae8d43a5d2cdfbe2fba6884207a Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 4 May 2023 00:44:27 +1000 Subject: [PATCH] GS/HW: Remove Tomb Raider CRC hacks It works correctly with tex-in-rt now. --- bin/resources/GameIndex.yaml | 18 +++++------ pcsx2/GS/Renderers/HW/GSHwHack.cpp | 51 ------------------------------ pcsx2/GS/Renderers/HW/GSHwHack.h | 3 -- 3 files changed, 9 insertions(+), 63 deletions(-) diff --git a/bin/resources/GameIndex.yaml b/bin/resources/GameIndex.yaml index 507c15fca6..ce572cd72a 100644 --- a/bin/resources/GameIndex.yaml +++ b/bin/resources/GameIndex.yaml @@ -19399,7 +19399,7 @@ SLES-53908: compat: 5 gsHWFixes: mipmap: 1 # Fixes distant characters and models but there are still some flickering textures. - getSkipCount: "GSC_TombRaiderLegend" + textureInsideRT: 1 # Needed for post processing effects. SLES-53909: name: "Full Spectrum Warrior - Ten Hammers" region: "PAL-G" @@ -21392,7 +21392,7 @@ SLES-54674: compat: 5 gsHWFixes: mipmap: 1 - getSkipCount: "GSC_TombRaiderAnniversary" + textureInsideRT: 1 # Needed for post processing effects. SLES-54675: name: "Street Warrior" region: "PAL-E" @@ -23360,7 +23360,7 @@ SLES-55442: region: "PAL-M8" compat: 5 gsHWFixes: - getSkipCount: "GSC_TombRaiderUnderWorld" + textureInsideRT: 1 # Needed for post processing effects. SLES-55443: name: "Mana Khemia - Alchemists of Al-Revis" region: "PAL-E" @@ -34400,7 +34400,7 @@ SLPM-66558: region: "NTSC-J" gsHWFixes: mipmap: 1 # Fixes distant characters and models but there are still some flickering textures. - getSkipCount: "GSC_TombRaiderLegend" + textureInsideRT: 1 # Needed for post processing effects. SLPM-66559: name: "Winning Post 6 [KOEI Selection]" region: "NTSC-J" @@ -41299,7 +41299,7 @@ SLPS-25856: region: "NTSC-J" gsHWFixes: mipmap: 1 - getSkipCount: "GSC_TombRaiderAnniversary" + textureInsideRT: 1 # Needed for post processing effects. SLPS-25858: name: "Dengeki SP - Shakugan no Shana" region: "NTSC-J" @@ -41488,7 +41488,7 @@ SLPS-25927: name: "Tomb Raider - Underworld" region: "NTSC-J" gsHWFixes: - getSkipCount: "GSC_TombRaiderUnderWorld" + textureInsideRT: 1 # Needed for post processing effects. SLPS-25930: name: "Major League Baseball 2K9" region: "NTSC-J" @@ -48032,7 +48032,7 @@ SLUS-21203: compat: 5 gsHWFixes: mipmap: 1 # Fixes distant characters and models but there are still some flickering textures. - getSkipCount: "GSC_TombRaiderLegend" + textureInsideRT: 1 # Needed for post processing effects. SLUS-21204: name: "Victorious Boxers 2 - Fighting Spirit" region: "NTSC-U" @@ -49965,7 +49965,7 @@ SLUS-21555: compat: 5 gsHWFixes: mipmap: 1 - getSkipCount: "GSC_TombRaiderAnniversary" + textureInsideRT: 1 # Needed for post processing effects. SLUS-21556: name: "Konami Kids Playground - Dinosaur Shapes & Colors" region: "NTSC-U" @@ -51411,7 +51411,7 @@ SLUS-21858: region: "NTSC-U" compat: 5 gsHWFixes: - getSkipCount: "GSC_TombRaiderUnderWorld" + textureInsideRT: 1 # Needed for post processing effects. SLUS-21860: name: "Bigs 2, The" region: "NTSC-U" diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.cpp b/pcsx2/GS/Renderers/HW/GSHwHack.cpp index b0069487dc..510c042b67 100644 --- a/pcsx2/GS/Renderers/HW/GSHwHack.cpp +++ b/pcsx2/GS/Renderers/HW/GSHwHack.cpp @@ -216,54 +216,6 @@ bool GSHwHack::GSC_Tekken5(GSRendererHW& r, int& skip) return true; } -bool GSHwHack::GSC_TombRaiderAnniversary(GSRendererHW& r, int& skip) -{ - if (skip == 0) - { - if (RTME && RFBP == 0x01000 && RFPSM == RTPSM && RTPSM == PSMCT32) - { - skip = 1; // Garbage TC - } - } - - return true; -} - -bool GSHwHack::GSC_TombRaiderLegend(GSRendererHW& r, int& skip) -{ - if (skip == 0) - { - // ||GSC_TBP0 ==0x2F00 - if (RTME && RFBP == 0x01000 && RFPSM == RTPSM && RTPSM == PSMCT32 && (RTBP0 == 0x2b60 || RTBP0 == 0x2b80 || RTBP0 == 0x2E60 || RTBP0 == 0x3020 || RTBP0 == 0x3200 || RTBP0 == 0x3320)) - { - skip = 1; // Garbage TC - } - else if (RTPSM == PSMCT32 && (RTPSM | RFBP) == 0x2fa0 && (RTBP0 == 0x2bc0) && RFBMSK == 0) - { - skip = 2; // Underwater black screen - } - } - - return true; -} - -bool GSHwHack::GSC_TombRaiderUnderWorld(GSRendererHW& r, int& skip) -{ - if (skip == 0) - { - if (RTME && RFBP == 0x01000 && RFPSM == RTPSM && RTPSM == PSMCT32 && (RTBP0 == 0x2B60 /*|| GSC_TBP0 == 0x2EFF || GSC_TBP0 ==0x2F00 || GSC_TBP0 == 0x3020*/ || (RTBP0 >= 0x2C01 && RTBP0 != 0x3029 && RTBP0 != 0x302d))) - { - skip = 1; // Garbage TC - } - else if (RTPSM == PSMCT32 && (RTPSM | RFBP) == 0x2c00 && (RTBP0 == 0x0ee0) && RFBMSK == 0) - { - skip = 2; // Underwater black screen - } - } - - return true; -} - bool GSHwHack::GSC_BurnoutGames(GSRendererHW& r, int& skip) { if (RFBW == 2 && std::abs(static_cast(RFBP) - static_cast(RZBP)) <= static_cast(BLOCKS_PER_PAGE)) @@ -1209,9 +1161,6 @@ const GSHwHack::Entry GSHwHack::s_get_skip_count_function CRC_F(GSC_SFEX3, CRCHackLevel::Partial), CRC_F(GSC_TalesOfLegendia, CRCHackLevel::Partial), CRC_F(GSC_TalesofSymphonia, CRCHackLevel::Partial), - CRC_F(GSC_TombRaiderAnniversary, CRCHackLevel::Partial), - CRC_F(GSC_TombRaiderLegend, CRCHackLevel::Partial), - CRC_F(GSC_TombRaiderUnderWorld, CRCHackLevel::Partial), CRC_F(GSC_UrbanReign, CRCHackLevel::Partial), CRC_F(GSC_ZettaiZetsumeiToshi2, CRCHackLevel::Partial), CRC_F(GSC_BlackAndBurnoutSky, CRCHackLevel::Partial), diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.h b/pcsx2/GS/Renderers/HW/GSHwHack.h index 6c9ab028ca..35ae59da33 100644 --- a/pcsx2/GS/Renderers/HW/GSHwHack.h +++ b/pcsx2/GS/Renderers/HW/GSHwHack.h @@ -25,9 +25,6 @@ public: static bool GSC_SakuraTaisen(GSRendererHW& r, int& skip); static bool GSC_SFEX3(GSRendererHW& r, int& skip); static bool GSC_Tekken5(GSRendererHW& r, int& skip); - static bool GSC_TombRaiderAnniversary(GSRendererHW& r, int& skip); - static bool GSC_TombRaiderLegend(GSRendererHW& r, int& skip); - static bool GSC_TombRaiderUnderWorld(GSRendererHW& r, int& skip); static bool GSC_BurnoutGames(GSRendererHW& r, int& skip); static bool GSC_BlackAndBurnoutSky(GSRendererHW& r, int& skip); static bool GSC_MidnightClub3(GSRendererHW& r, int& skip);