From 702e354a6aec88fdbdcd60351baf80989ec09c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 Nov 2017 22:18:28 +0100 Subject: [PATCH] Vulkan multithread: Fix race condition. --- ext/native/thin3d/VulkanRenderManager.cpp | 10 ++++++++-- ext/native/thin3d/VulkanRenderManager.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ext/native/thin3d/VulkanRenderManager.cpp b/ext/native/thin3d/VulkanRenderManager.cpp index 53db35ffc6..b87f9a6d63 100644 --- a/ext/native/thin3d/VulkanRenderManager.cpp +++ b/ext/native/thin3d/VulkanRenderManager.cpp @@ -187,11 +187,14 @@ void VulkanRenderManager::CreateBackbuffers() { curWidth_ = -1; curHeight_ = -1; + VLOG("Backbuffers Created"); + // Start the thread. if (useThread) { run_ = true; // Won't necessarily be 0. threadInitFrame_ = vulkan_->GetCurFrame(); + VLOG("starting thread"); thread_ = std::thread(&VulkanRenderManager::ThreadFunc, this); } } @@ -212,6 +215,7 @@ void VulkanRenderManager::StopThread(bool shutdown) { } } thread_.join(); + VLOG("thread joined."); // Resignal fences for next time around - must be done after join. for (int i = 0; i < vulkan_->GetInflightFrames(); i++) { @@ -243,6 +247,7 @@ void VulkanRenderManager::DestroyBackbuffers() { framebuffers_.clear(); swapchainImages_.clear(); + VLOG("Backbuffers Destroyed"); } VulkanRenderManager::~VulkanRenderManager() { @@ -283,8 +288,8 @@ void VulkanRenderManager::ThreadFunc() { } VLOG("PULL: frame[%d].readyForRun = false", threadFrame); frameData.readyForRun = false; - if (!run_) // quick exit if bailing. - return; + // Previously we had a quick exit here that avoided calling Run() if run_ was suddenly false, + // but that created a race condition where frames could end up not finished properly on resize etc. // Only increment next time if we're done. nextFrame = frameData.type == VKRRunType::END; @@ -298,6 +303,7 @@ void VulkanRenderManager::ThreadFunc() { } void VulkanRenderManager::BeginFrame() { + VLOG("BeginFrame"); VkDevice device = vulkan_->GetDevice(); int curFrame = vulkan_->GetCurFrame(); diff --git a/ext/native/thin3d/VulkanRenderManager.h b/ext/native/thin3d/VulkanRenderManager.h index f567163fa5..22f2649da0 100644 --- a/ext/native/thin3d/VulkanRenderManager.h +++ b/ext/native/thin3d/VulkanRenderManager.h @@ -250,7 +250,7 @@ private: // Swapchain. bool hasBegun = false; - uint32_t curSwapchainImage; + uint32_t curSwapchainImage = -1; }; FrameData frameData_[VulkanContext::MAX_INFLIGHT_FRAMES];