diff --git a/Common/GPU/Vulkan/VulkanQueueRunner.cpp b/Common/GPU/Vulkan/VulkanQueueRunner.cpp index 327bdf332e..cc84a0eefb 100644 --- a/Common/GPU/Vulkan/VulkanQueueRunner.cpp +++ b/Common/GPU/Vulkan/VulkanQueueRunner.cpp @@ -1703,9 +1703,8 @@ void VulkanQueueRunner::PerformBlit(const VKRStep &step, VkCommandBuffer cmd) { // We can't copy only depth or only stencil unfortunately. if (step.blit.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { - _dbg_assert_(src->depth.image != VK_NULL_HANDLE); - _dbg_assert_(dst->depth.image != VK_NULL_HANDLE); - + _assert_(src->depth.image != VK_NULL_HANDLE); + _assert_(dst->depth.image != VK_NULL_HANDLE); SetupTransitionToTransferSrc(src->depth, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, &recordBarrier_); SetupTransitionToTransferDst(dst->depth, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, &recordBarrier_); } diff --git a/Common/GPU/Vulkan/VulkanRenderManager.cpp b/Common/GPU/Vulkan/VulkanRenderManager.cpp index a68d8ff1bd..f271dabcbe 100644 --- a/Common/GPU/Vulkan/VulkanRenderManager.cpp +++ b/Common/GPU/Vulkan/VulkanRenderManager.cpp @@ -415,6 +415,10 @@ void VulkanRenderManager::DestroyBackbuffers() { VulkanRenderManager::~VulkanRenderManager() { INFO_LOG(G3D, "VulkanRenderManager destructor"); + if (useRenderThread_) { + _dbg_assert_(!renderThread_.joinable()); + } + _dbg_assert_(!runCompileThread_); // StopThread should already have been called from DestroyBackbuffers. vulkan_->WaitUntilQueueIdle(); @@ -1284,8 +1288,13 @@ void VulkanRenderManager::BlitFramebuffer(VKRFramebuffer *src, VkRect2D srcRect, EndCurRenderStep(); - VKRStep *step = new VKRStep{ VKRStepType::BLIT }; + // Sanity check. Added an assert to try to gather more info. + if (aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { + _assert_msg_(src->depth.image != VK_NULL_HANDLE, "%s", src->Tag()); + _assert_msg_(dst->depth.image != VK_NULL_HANDLE, "%s", dst->Tag()); + } + VKRStep *step = new VKRStep{ VKRStepType::BLIT }; step->blit.aspectMask = aspectMask; step->blit.src = src; step->blit.srcRect = srcRect;