From 714205d699d7a79da1130e7ba8c48668dc73d540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sun, 3 Nov 2019 18:22:48 +0100
Subject: [PATCH] Vulkan: Enable renderpass merging for all games (was
 introduced in 1.9 for GoW games). A number of other games can also benefit.

---
 Core/Compatibility.cpp    |  1 -
 Core/Compatibility.h      |  1 -
 GPU/Vulkan/GPU_Vulkan.cpp |  5 +++--
 assets/compat.ini         | 36 ------------------------------------
 4 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/Core/Compatibility.cpp b/Core/Compatibility.cpp
index b006447072..1d8c9d513a 100644
--- a/Core/Compatibility.cpp
+++ b/Core/Compatibility.cpp
@@ -59,7 +59,6 @@ void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) {
 	CheckSetting(iniFile, gameID, "DisableAccurateDepth", &flags_.DisableAccurateDepth);
 	CheckSetting(iniFile, gameID, "MGS2AcidHack", &flags_.MGS2AcidHack);
 	CheckSetting(iniFile, gameID, "SonicRivalsHack", &flags_.SonicRivalsHack);
-	CheckSetting(iniFile, gameID, "RenderPassMerge", &flags_.RenderPassMerge);
 	CheckSetting(iniFile, gameID, "BlockTransferAllowCreateFB", &flags_.BlockTransferAllowCreateFB);
 	CheckSetting(iniFile, gameID, "YugiohSaveFix", &flags_.YugiohSaveFix);
 	CheckSetting(iniFile, gameID, "ForceUMDDelay", &flags_.ForceUMDDelay);
diff --git a/Core/Compatibility.h b/Core/Compatibility.h
index 0baf9db5fa..460776a90a 100644
--- a/Core/Compatibility.h
+++ b/Core/Compatibility.h
@@ -59,7 +59,6 @@ struct CompatFlags {
 	bool DisableAccurateDepth;
 	bool MGS2AcidHack;
 	bool SonicRivalsHack;
-	bool RenderPassMerge;
 	bool BlockTransferAllowCreateFB;
 	bool YugiohSaveFix;
 	bool ForceUMDDelay;
diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp
index 1a5e254e27..3f20ec0642 100644
--- a/GPU/Vulkan/GPU_Vulkan.cpp
+++ b/GPU/Vulkan/GPU_Vulkan.cpp
@@ -485,8 +485,9 @@ void GPU_Vulkan::InitDeviceObjects() {
 		hacks |= QUEUE_HACK_MGS2_ACID;
 	if (PSP_CoreParameter().compat.flags().SonicRivalsHack)
 		hacks |= QUEUE_HACK_SONIC;
-	if (PSP_CoreParameter().compat.flags().RenderPassMerge)
-		hacks |= QUEUE_HACK_RENDERPASS_MERGE;
+
+	// Always on.
+	hacks |= QUEUE_HACK_RENDERPASS_MERGE;
 
 	if (hacks) {
 		rm->GetQueueRunner()->EnableHacks(hacks);
diff --git a/assets/compat.ini b/assets/compat.ini
index c67f0b8360..55a47296eb 100644
--- a/assets/compat.ini
+++ b/assets/compat.ini
@@ -648,42 +648,6 @@ ULAS42214 = true
 ULJS19054 = true
 NPJH50184 = true
 
-[RenderPassMerge]
-UCJS10114 = true
-UCKS45084 = true
-# GOW : Ghost of Sparta
-UCUS98737 = true
-UCAS40323 = true
-NPHG00092 = true
-NPEG00044 = true
-NPEG00045 = true
-NPJG00120 = true
-NPUG80508 = true
-UCJS10114 = true
-UCES01401 = true
-UCES01473 = true
-# GOW : Ghost of Sparta Demo
-NPEG90035 = true
-NPUG70125 = true
-NPJG90095 = true
-# GOW : Chains Of Olympus
-UCAS40198 = true
-UCUS98653 = true
-UCES00842 = true
-ULJM05438 = true
-ULJM05348 = true
-UCKS45084 = true
-NPUG80325 = true
-NPEG00023 = true
-NPHG00027 = true
-NPHG00028 = true
-NPJH50170 = true
-UCET00844 = true
-# GOW: Chains of Olympus Demo
-UCUS98705 = true
-UCED00971 = true
-UCUS98713 = true
-
 [ForceSoftwareRenderer]
 # Darkstalkers
 ULES00016 = true