From 6d7eceb4f17973f5362f78a48a726ef5076c6797 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 26 Mar 2023 22:17:37 +1000 Subject: [PATCH] GS/HW: Remove JakGames/JakX CRC hack --- bin/resources/GameIndex.yaml | 63 ++++++++++++++++-------------- pcsx2/GS/Renderers/HW/GSHwHack.cpp | 15 ------- pcsx2/GS/Renderers/HW/GSHwHack.h | 1 - 3 files changed, 34 insertions(+), 45 deletions(-) diff --git a/bin/resources/GameIndex.yaml b/bin/resources/GameIndex.yaml index c3ed6c2c70..b1be8c579a 100644 --- a/bin/resources/GameIndex.yaml +++ b/bin/resources/GameIndex.yaml @@ -3976,11 +3976,12 @@ SCES-53286: region: "PAL-M7" gsHWFixes: roundSprite: 1 # Fix lines in the sky. - textureInsideRT: 1 # Fixes broken character models. autoFlush: 1 # Fixes lighting. - mipmap: 2 # Fixes bad textures. - trilinearFiltering: 1 # Fixes smooths texture transitions. - beforeDraw: "OI_JakX" + mipmap: 2 # Fixes broken textures. + trilinearFiltering: 1 # Fixes water textures. + cpuSpriteRenderBW: 2 # Fixes water textures. Can't use BW 4 here because of post effects. + cpuSpriteRenderLevel: 2 # Needed for above. + textureInsideRT: 1 # Fixes broken character models. memcardFilters: # Reads Ratchet Gladiator data. - "SCES-53286" - "SCES-53285" @@ -8063,11 +8064,10 @@ SCUS-97374: gameFixes: - EETimingHack # Fixes SPR errors while going in-game. gsHWFixes: - roundSprite: 1 # Fix lines in the sky. - mipmap: 1 # Fixes broken textures. - textureInsideRT: 1 # Fixes broken character models. - autoFlush: 1 # Fixes lighting. - beforeDraw: "OI_JakX" + mipmap: 2 # Fixes broken textures. + trilinearFiltering: 1 # Fixes water textures. + cpuSpriteRenderBW: 4 # Fixes character and water textures. + cpuSpriteRenderLevel: 2 # Needed for above. SCUS-97377: name: "Syphon Filter - The Omega Strain [Regular Demo]" region: "NTSC-U" @@ -8261,11 +8261,12 @@ SCUS-97429: compat: 5 gsHWFixes: roundSprite: 1 # Fix lines in the sky. - textureInsideRT: 1 # Fixes broken character models. autoFlush: 1 # Fixes lighting. - mipmap: 2 # Fixes bad textures. - trilinearFiltering: 1 # Fixes smooths texture transitions. - beforeDraw: "OI_JakX" + mipmap: 2 # Fixes broken textures. + trilinearFiltering: 1 # Fixes water textures. + cpuSpriteRenderBW: 2 # Fixes water textures. Can't use BW 4 here because of post effects. + cpuSpriteRenderLevel: 2 # Needed for above. + textureInsideRT: 1 # Fixes broken character models. memcardFilters: - "SCUS-97429" - "SCUS-97465" @@ -8534,11 +8535,12 @@ SCUS-97486: region: "NTSC-U" gsHWFixes: roundSprite: 1 # Fix lines in the sky. - textureInsideRT: 1 # Fixes broken character models. autoFlush: 1 # Fixes lighting. - mipmap: 2 # Fixes bad textures. - trilinearFiltering: 1 # Fixes smooths texture transitions. - beforeDraw: "OI_JakX" + mipmap: 2 # Fixes broken textures. + trilinearFiltering: 1 # Fixes water textures. + cpuSpriteRenderBW: 2 # Fixes water textures. Can't use BW 4 here because of post effects. + cpuSpriteRenderLevel: 2 # Needed for above. + textureInsideRT: 1 # Fixes broken character models. SCUS-97487: name: "Ratchet - Deadlocked [Public Beta v.1]" region: "NTSC-U" @@ -8556,11 +8558,12 @@ SCUS-97488: compat: 5 gsHWFixes: roundSprite: 1 # Fix lines in the sky. - textureInsideRT: 1 # Fixes broken character models. autoFlush: 1 # Fixes lighting. - mipmap: 2 # Fixes bad textures. - trilinearFiltering: 1 # Fixes smooths texture transitions. - beforeDraw: "OI_JakX" + mipmap: 2 # Fixes broken textures. + trilinearFiltering: 1 # Fixes water textures. + cpuSpriteRenderBW: 2 # Fixes water textures. Can't use BW 4 here because of post effects. + cpuSpriteRenderLevel: 2 # Needed for above. + textureInsideRT: 1 # Fixes broken character models. SCUS-97489: name: "SOCOM 3 - U.S. Navy SEALs [Public Beta v.1]" region: "NTSC-U" @@ -8857,11 +8860,12 @@ SCUS-97574: region: "NTSC-U" gsHWFixes: roundSprite: 1 # Fix lines in the sky. - textureInsideRT: 1 # Fixes broken character models. autoFlush: 1 # Fixes lighting. - mipmap: 2 # Fixes bad textures. - trilinearFiltering: 1 # Fixes smooths texture transitions. - beforeDraw: "OI_JakX" + mipmap: 2 # Fixes broken textures. + trilinearFiltering: 1 # Fixes water textures. + cpuSpriteRenderBW: 2 # Fixes water textures. Can't use BW 4 here because of post effects. + cpuSpriteRenderLevel: 2 # Needed for above. + textureInsideRT: 1 # Fixes broken character models. SCUS-97579: name: "ATV Offroad Fury 4 [Demo]" region: "NTSC-U" @@ -51902,11 +51906,12 @@ TCES-53286: compat: 5 gsHWFixes: roundSprite: 1 # Fix lines in the sky. - textureInsideRT: 1 # Fixes broken character models. autoFlush: 1 # Fixes lighting. - mipmap: 2 # Fixes bad textures. - trilinearFiltering: 1 # Fixes smooths texture transitions. - beforeDraw: "OI_JakX" + mipmap: 2 # Fixes broken textures. + trilinearFiltering: 1 # Fixes water textures. + cpuSpriteRenderBW: 2 # Fixes water textures. Can't use BW 4 here because of post effects. + cpuSpriteRenderLevel: 2 # Needed for above. + textureInsideRT: 1 # Fixes broken character models. TCPS-10058: name: "Densha de Go! Shinkansen [with Controller]" region: "NTSC-J" diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.cpp b/pcsx2/GS/Renderers/HW/GSHwHack.cpp index cd9e4b567b..4424f6b60b 100644 --- a/pcsx2/GS/Renderers/HW/GSHwHack.cpp +++ b/pcsx2/GS/Renderers/HW/GSHwHack.cpp @@ -1094,20 +1094,6 @@ bool GSHwHack::OI_ArTonelico2(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GST return true; } -bool GSHwHack::OI_JakX(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) -{ - if (RCONTEXT->FRAME.FBW != 1 || !(r.m_r == GSVector4i(0, 0, 16, 16)).alltrue()) - return true; // Only 16x16 draws. - - if (!r.CanUseSwSpriteRender()) - return true; - - // Render 16x16 palette via CPU. - r.SwSpriteRender(); - - return false; // Skip current draw. -} - bool GSHwHack::OI_BurnoutGames(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t) { if (!OI_PointListPalette(r, rt, ds, t)) @@ -1236,7 +1222,6 @@ const GSHwHack::Entry GSHwHack::s_before_draw_functions[] CRC_F(OI_RozenMaidenGebetGarden, CRCHackLevel::Minimum), CRC_F(OI_SonicUnleashed, CRCHackLevel::Minimum), CRC_F(OI_ArTonelico2, CRCHackLevel::Minimum), - CRC_F(OI_JakX, CRCHackLevel::Minimum), CRC_F(OI_BurnoutGames, CRCHackLevel::Minimum), CRC_F(OI_Battlefield2, CRCHackLevel::Minimum), }; diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.h b/pcsx2/GS/Renderers/HW/GSHwHack.h index 45c46eb357..2b3a3f7766 100644 --- a/pcsx2/GS/Renderers/HW/GSHwHack.h +++ b/pcsx2/GS/Renderers/HW/GSHwHack.h @@ -61,7 +61,6 @@ public: 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); - static bool OI_JakX(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); static bool OI_BurnoutGames(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); static bool OI_Battlefield2(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);