From a654f5bf13ba8157f961ea6225516dc694e58ed7 Mon Sep 17 00:00:00 2001 From: refractionpcsx2 Date: Sat, 26 Aug 2023 03:12:01 +0100 Subject: [PATCH] GS/HW: Remove Final Fantasy X CRC hack --- bin/resources/GameIndex.yaml | 16 ---------------- pcsx2/GS/Renderers/HW/GSHwHack.cpp | 17 ----------------- pcsx2/GS/Renderers/HW/GSHwHack.h | 1 - 3 files changed, 34 deletions(-) diff --git a/bin/resources/GameIndex.yaml b/bin/resources/GameIndex.yaml index 6d16025653..edd1105dbf 100644 --- a/bin/resources/GameIndex.yaml +++ b/bin/resources/GameIndex.yaml @@ -2224,7 +2224,6 @@ SCED-50642: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SCED-50660: name: "Dropship - United Peace Force" region: "PAL-A" @@ -2348,7 +2347,6 @@ SCED-50907: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SCED-50916: name: "Ratchet & Clank [Demo]" region: "PAL-M5" @@ -3979,7 +3977,6 @@ SCES-50490: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SCES-50491: name: "Final Fantasy X" region: "PAL-F" @@ -3988,7 +3985,6 @@ SCES-50491: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SCES-50492: name: "Final Fantasy X" region: "PAL-G" @@ -3998,7 +3994,6 @@ SCES-50492: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters.. - beforeDraw: "OI_FFX" SCES-50493: name: "Final Fantasy X" region: "PAL-I" @@ -4007,7 +4002,6 @@ SCES-50493: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SCES-50494: name: "Final Fantasy X" region: "PAL-S" @@ -4016,7 +4010,6 @@ SCES-50494: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SCES-50499: name: "Ecco the Dolphin - Defender of the Future" region: "PAL-M5" @@ -26846,7 +26839,6 @@ SLKA-25214: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SLKA-25215: name: "Shining Wind" region: "NTSC-K" @@ -32664,7 +32656,6 @@ SLPM-65115: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SLPM-65116: name: "Lilie no Atelier Plus - Salburg no Renkinjutsushi 3" region: "NTSC-J" @@ -36383,7 +36374,6 @@ SLPM-66124: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SLPM-66125: name: "Final Fantasy X-2 [Ultimate Hits]" region: "NTSC-J" @@ -38696,7 +38686,6 @@ SLPM-66677: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SLPM-66678: name: "Final Fantasy X-2 - International + Last Mission [Ultimate Hits]" region: "NTSC-J" @@ -40013,7 +40002,6 @@ SLPM-67513: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SLPM-67514: name: "Kessen" region: "NTSC-K" @@ -42573,7 +42561,6 @@ SLPS-25050: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SLPS-25051: name: "Missing Blue" region: "NTSC-J" @@ -42734,7 +42721,6 @@ SLPS-25088: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SLPS-25089: name: "Salt Lake 2002" region: "NTSC-J" @@ -46144,7 +46130,6 @@ SLPS-72501: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SLPS-72502: name: "Tales of Destiny 2 [Mega Hits]" region: "NTSC-J" @@ -48047,7 +48032,6 @@ SLUS-20312: gsHWFixes: roundSprite: 2 # Fixes font artifacts. textureInsideRT: 1 # Fixes wrong visuals for the summon Anima and The (Triple) Magus Sisters. - beforeDraw: "OI_FFX" SLUS-20313: name: "Wave Rally" region: "NTSC-U" diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.cpp b/pcsx2/GS/Renderers/HW/GSHwHack.cpp index 364662ab8a..566c35001a 100644 --- a/pcsx2/GS/Renderers/HW/GSHwHack.cpp +++ b/pcsx2/GS/Renderers/HW/GSHwHack.cpp @@ -976,22 +976,6 @@ bool GSHwHack::OI_DBZBTGames(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTe return false; // Skip current draw } -bool GSHwHack::OI_FFX(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) -{ - const u32 FBP = RFRAME.Block(); - const u32 ZBP = RZBUF.Block(); - const u32 TBP = RTEX0.TBP0; - - if (ds && (FBP == 0x00d00 || FBP == 0x00000) && ZBP == 0x02100 && RPRIM->TME && TBP == 0x01a00 && RTEX0.PSM == PSMCT16S) - { - // random battle transition (z buffer written directly, clear it now) - GL_INS("OI_FFX ZB clear"); - g_gs_device->ClearDepth(ds, 0.0f); - } - - return true; -} - bool GSHwHack::OI_RozenMaidenGebetGarden(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) { if (!RPRIM->TME) @@ -1501,7 +1485,6 @@ const GSHwHack::Entry GSHwHack::s_get_skip_count_function const GSHwHack::Entry GSHwHack::s_before_draw_functions[] = { CRC_F(OI_PointListPalette), CRC_F(OI_DBZBTGames), - CRC_F(OI_FFX), CRC_F(OI_RozenMaidenGebetGarden), CRC_F(OI_SonicUnleashed), CRC_F(OI_ArTonelico2), diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.h b/pcsx2/GS/Renderers/HW/GSHwHack.h index 2bb5c04036..775c813b42 100644 --- a/pcsx2/GS/Renderers/HW/GSHwHack.h +++ b/pcsx2/GS/Renderers/HW/GSHwHack.h @@ -49,7 +49,6 @@ public: static bool OI_PointListPalette(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); static bool OI_DBZBTGames(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); - static bool OI_FFX(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); static bool OI_RozenMaidenGebetGarden(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); static bool OI_SonicUnleashed(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); static bool OI_ArTonelico2(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);