From 612fdb957efac8912331db1876aff2e347c05539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 19 May 2020 00:44:42 +0200
Subject: [PATCH] Revert "Experimental commit that effectively reverts the
 Vulkan part of #12882."

This reverts commit 29d1f97dd5da4c674e220ae30ae2dc1ec2a43af3.
---
 ext/native/thin3d/VulkanQueueRunner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/native/thin3d/VulkanQueueRunner.cpp b/ext/native/thin3d/VulkanQueueRunner.cpp
index 8374342813..a74a679e6e 100644
--- a/ext/native/thin3d/VulkanQueueRunner.cpp
+++ b/ext/native/thin3d/VulkanQueueRunner.cpp
@@ -790,7 +790,7 @@ void VulkanQueueRunner::ApplyRenderPassMerge(std::vector<VKRStep *> &steps) {
 				case VKRStepType::RENDER:
 					if (steps[j]->render.framebuffer == fb) {
 						// Prevent Unknown's example case from https://github.com/hrydgard/ppsspp/pull/12242
-						if (steps[j]->dependencies.contains(touchedFramebuffers)) {
+						if (renderHasClear(steps[j]) || steps[j]->dependencies.contains(touchedFramebuffers)) {
 							goto done_fb;
 						} else {
 							// Safe to merge, great.