From 47f453d7aa6adbeae85666350fba205e3a52ff1d Mon Sep 17 00:00:00 2001 From: Stenzek Date: Fri, 12 Jan 2018 13:17:22 +1000 Subject: [PATCH] Vulkan: Fix waiting on non-existant fence when reading back --- Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp | 3 --- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp index 5d70d38584..4b13320476 100644 --- a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp @@ -377,9 +377,6 @@ void CommandBufferManager::OnCommandBufferExecuted(size_t index) backup_iter->second.second(resources.fence); } - for (const auto& iter : m_fence_point_callbacks) - iter.second.second(resources.fence); - // Clean up all objects pending destruction on this command buffer for (auto& it : resources.cleanup_resources) it(); diff --git a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp index 0edaec8a63..4a4f70c2cb 100644 --- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp @@ -497,6 +497,7 @@ void VKStagingTexture::Flush() { // WaitForFence should fire the callback. g_command_buffer_mgr->WaitForFence(m_flush_fence); + m_flush_fence = VK_NULL_HANDLE; } else {