From 3d73f214cbcfc783e37f4916fc1a08cb84260cac Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 7 May 2020 17:50:37 +0100 Subject: [PATCH] Flush queue inside ApplyInitialContents instead of outside --- renderdoc/driver/vulkan/vk_core.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 60d5267f4..30db6d2d0 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -2386,11 +2386,6 @@ ReplayStatus WrappedVulkan::ContextReplayLog(CaptureState readType, uint32_t sta ApplyInitialContents(); - SubmitAndFlushImageStateBarriers(m_setupImageBarriers); - SubmitCmds(); - FlushQ(); - SubmitAndFlushImageStateBarriers(m_cleanupImageBarriers); - SetDebugMessageSink(sink); } @@ -2633,12 +2628,10 @@ void WrappedVulkan::ApplyInitialContents() vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); RDCASSERTEQUAL(vkr, VK_SUCCESS); -#if ENABLED(SINGLE_FLUSH_VALIDATE) SubmitAndFlushImageStateBarriers(m_setupImageBarriers); SubmitCmds(); FlushQ(); SubmitAndFlushImageStateBarriers(m_cleanupImageBarriers); -#endif } bool WrappedVulkan::ContextProcessChunk(ReadSerialiser &ser, VulkanChunk chunk) @@ -3131,11 +3124,6 @@ void WrappedVulkan::ReplayLog(uint32_t startEventID, uint32_t endEventID, Replay VkMarkerRegion::Begin("!!!!RenderDoc Internal: ApplyInitialContents"); ApplyInitialContents(); VkMarkerRegion::End(); - - SubmitAndFlushImageStateBarriers(m_setupImageBarriers); - SubmitCmds(); - FlushQ(); - SubmitAndFlushImageStateBarriers(m_cleanupImageBarriers); } m_State = CaptureState::ActiveReplaying;