From 29d1f97dd5da4c674e220ae30ae2dc1ec2a43af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 19 May 2020 00:41:41 +0200 Subject: [PATCH] Experimental commit that effectively reverts the Vulkan part of #12882. For the #12927 investigation. --- 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 a74a679e6e..8374342813 100644 --- a/ext/native/thin3d/VulkanQueueRunner.cpp +++ b/ext/native/thin3d/VulkanQueueRunner.cpp @@ -790,7 +790,7 @@ void VulkanQueueRunner::ApplyRenderPassMerge(std::vector &steps) { case VKRStepType::RENDER: if (steps[j]->render.framebuffer == fb) { // Prevent Unknown's example case from https://github.com/hrydgard/ppsspp/pull/12242 - if (renderHasClear(steps[j]) || steps[j]->dependencies.contains(touchedFramebuffers)) { + if (steps[j]->dependencies.contains(touchedFramebuffers)) { goto done_fb; } else { // Safe to merge, great.