From a7900b342ea825e81804c1bb6d77c20571ee9cb2 Mon Sep 17 00:00:00 2001
From: lightningterror <18107717+lightningterror@users.noreply.github.com>
Date: Mon, 28 Mar 2022 09:59:41 +0200
Subject: [PATCH] GS-hw: Purge GodOfWar 1 and 2 crc hacks.

Not needed, can be solved with upscaling hw hacks, and gs db fixes are a thing.
---
 pcsx2/GS/GSCrc.cpp                 | 28 -----------------
 pcsx2/GS/GSCrc.h                   |  2 --
 pcsx2/GS/Renderers/HW/GSHwHack.cpp | 49 ------------------------------
 3 files changed, 79 deletions(-)

diff --git a/pcsx2/GS/GSCrc.cpp b/pcsx2/GS/GSCrc.cpp
index a81863439d..b2940acbda 100644
--- a/pcsx2/GS/GSCrc.cpp
+++ b/pcsx2/GS/GSCrc.cpp
@@ -156,34 +156,6 @@ const CRC::Game CRC::m_games[] =
 	{0x652050D2, Tekken5, US, 0},
 	{0xEA64EF39, Tekken5, KO, 0},
 	{0x9E98B8AE, IkkiTousen, JP, 0},
-	{0xD6385328, GodOfWar, US, 0},
-	{0xF2A8D307, GodOfWar, US, 0},
-	{0xA61A4C6D, GodOfWar, US, 0},
-	{0xDF3A5A5C, GodOfWar, US, 0}, // Demo
-	{0xFB0E6D72, GodOfWar, EU, 0},
-	{0xEB001875, GodOfWar, EU, 0},
-	{0xCF148C74, GodOfWar, EU, 0},
-	{0xDF1AF973, GodOfWar, EU, 0},
-	{0xCA052D22, GodOfWar, JP, 0},
-	{0xBFCC1795, GodOfWar, KO, 0},
-	{0x9567B7D6, GodOfWar, KO, 0},
-	{0x9B5C97BA, GodOfWar, KO, 0},
-	{0xE23D532B, GodOfWar, NoRegion, 0},
-	{0x1A85E924, GodOfWar, NoRegion, 0},
-	{0x608ACBD3, GodOfWar, CH, 0},
-	// {0x1A85E924, GodOfWar, NoRegion, 0}, // same CRC as {0x1A85E924, DevilMayCry3, CH, 0}
-	{0x2F123FD8, GodOfWar2, US, 0},
-	{0x44A8A22A, GodOfWar2, EU, 0},
-	{0x60BC362B, GodOfWar2, EU, 0},
-	{0x4340C7C6, GodOfWar2, KO, 0},
-	{0xE96E55BD, GodOfWar2, JP, 0},
-	{0xF8CD3DF6, GodOfWar2, NoRegion, 0},
-	{0x0B82BFF7, GodOfWar2, NoRegion, 0},
-	{0x5990866F, GodOfWar2, NoRegion, 0},
-	{0xC4C4FD5F, GodOfWar2, CH, 0},
-	{0xDCD9A9F7, GodOfWar2, EU, 0},
-	{0xFA0DF523, GodOfWar2, CH, 0},
-	{0x9FEE3466, GodOfWar2, CH, 0},
 	{0x95CC86EF, GiTS, US, 0}, // same CRC also reported as EU
 	{0x2C5BF134, GiTS, US, 0}, // Demo
 	{0xA5768F53, GiTS, JP, 0},
diff --git a/pcsx2/GS/GSCrc.h b/pcsx2/GS/GSCrc.h
index 06e2ca873c..2efbaf4b39 100644
--- a/pcsx2/GS/GSCrc.h
+++ b/pcsx2/GS/GSCrc.h
@@ -38,8 +38,6 @@ public:
 		GetawayGames,
 		GiTS,
 		GodHand,
-		GodOfWar,
-		GodOfWar2,
 		HauntingGround,
 		ICO,
 		IkkiTousen,
diff --git a/pcsx2/GS/Renderers/HW/GSHwHack.cpp b/pcsx2/GS/Renderers/HW/GSHwHack.cpp
index 3d6bd3cd0d..382c954e06 100644
--- a/pcsx2/GS/Renderers/HW/GSHwHack.cpp
+++ b/pcsx2/GS/Renderers/HW/GSHwHack.cpp
@@ -108,26 +108,6 @@ bool GSC_GiTS(const GSFrameInfo& fi, int& skip)
 	return true;
 }
 
-bool GSC_GodOfWar2(const GSFrameInfo& fi, int& skip)
-{
-	if (skip == 0)
-	{
-		if (CRC_Aggressive && fi.TME && fi.TPSM == PSM_PSMCT24 && fi.FBP == 0x1300 && (fi.TBP0 == 0x0F00 || fi.TBP0 == 0x1300 || fi.TBP0 == 0x2b00)) // || fi.FBP == 0x0100
-		{
-			// Ghosting when upscaling, HPO helps but isn't perfect.
-			skip = 1; // global haze/halo
-		}
-		else if ((CRC_Aggressive || !s_nativeres) && fi.TME && fi.TPSM == PSM_PSMCT24 && (fi.FBP == 0x0100 || fi.FBP == 0x2100) && (fi.TBP0 == 0x2b00 || fi.TBP0 == 0x2e80 || fi.TBP0 == 0x3100)) // 480P 2e80, interlaced 3100
-		{
-			// Upscaling issue.
-			// Don't enable hack on native res if crc is below aggressive.
-			skip = 1; // water effect and water vertical lines
-		}
-	}
-
-	return true;
-}
-
 // Channel effect not properly supported yet
 bool GSC_Manhunt2(const GSFrameInfo& fi, int& skip)
 {
@@ -788,33 +768,6 @@ bool GSC_AceCombat4(const GSFrameInfo& fi, int& skip)
 	return true;
 }
 
-bool GSC_GodOfWar(const GSFrameInfo& fi, int& skip)
-{
-	if (skip == 0)
-	{
-		if (fi.TME && fi.FBP == 0x00000 && fi.FPSM == PSM_PSMCT16 && fi.TBP0 == 0x00000 && fi.TPSM == PSM_PSMCT16 && fi.FBMSK == 0x03FFF)
-		{
-			// Can be used as a speed hack.
-			// Removes shadows.
-			skip = 1000;
-		}
-		else if (fi.TME && fi.FBP == 0x00000 && fi.FPSM == PSM_PSMCT32 && fi.TBP0 == 0x00000 && fi.TPSM == PSM_PSMCT32 && fi.FBMSK == 0xff000000)
-		{
-			// Upscaling hack maybe ? Needs to be verified, move it to Aggressive state just in case.
-			skip = 1; // blur
-		}
-	}
-	else
-	{
-		if (fi.TME && fi.FBP == 0x00000 && fi.FPSM == PSM_PSMCT16)
-		{
-			skip = 3;
-		}
-	}
-
-	return true;
-}
-
 bool GSC_FFXGames(const GSFrameInfo& fi, int& skip)
 {
 	if (skip == 0)
@@ -978,7 +931,6 @@ void GSState::SetupCrcHack()
 		// Upscaling hacks
 		lut[CRC::DBZBT3] = GSC_DBZBT3;
 		lut[CRC::FightingBeautyWulong] = GSC_FightingBeautyWulong;
-		lut[CRC::GodOfWar2] = GSC_GodOfWar2;
 		lut[CRC::IkkiTousen] = GSC_IkkiTousen;
 		lut[CRC::Oneechanbara2Special] = GSC_Oneechanbara2Special;
 		lut[CRC::UltramanFightingEvolution] = GSC_UltramanFightingEvolution;
@@ -1008,7 +960,6 @@ void GSState::SetupCrcHack()
 		lut[CRC::XenosagaE3] = GSC_XenosagaE3;
 
 		// Upscaling issues
-		lut[CRC::GodOfWar] = GSC_GodOfWar;
 		lut[CRC::Okami] = GSC_Okami;
 	}