From e400e9c4f6c87af5d3ebf0b1dc77d18f61fb31e1 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 7 Nov 2022 17:03:44 +0000 Subject: [PATCH] Use initial state command buffer for memory --- renderdoc/driver/vulkan/vk_initstate.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp index 26304bff6..fa812dcc6 100644 --- a/renderdoc/driver/vulkan/vk_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_initstate.cpp @@ -2097,11 +2097,6 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, const VkInitialConten } } - VkResult vkr = VK_SUCCESS; - - VkCommandBufferBeginInfo beginInfo = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, - VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT}; - VkBuffer srcBuf = initial.buf; VkBuffer dstBuf = m_CreationInfo.m_Memory[id].wholeMemBuf; @@ -2118,14 +2113,11 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, const VkInitialConten return; // no copy or clear required } - VkCommandBuffer cmd = GetNextCmd(); + VkCommandBuffer cmd = GetInitStateCmd(); if(cmd == VK_NULL_HANDLE) return; - vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - CheckVkResult(vkr); - VkMarkerRegion::Begin(StringFormat::Fmt("Initial state for %s", ToStr(orig).c_str()), cmd); rdcarray regions; @@ -2157,11 +2149,10 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, const VkInitialConten VkMarkerRegion::End(cmd); - vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); - CheckVkResult(vkr); - #if ENABLED(SINGLE_FLUSH_VALIDATE) + CloseInitStateCmd(); SubmitCmds(); + FlushQ(); #endif } else