From 08a63f2c0b6934a1b9a60a45aa58bc967abbc81f Mon Sep 17 00:00:00 2001 From: baldurk Date: Sun, 11 Oct 2015 12:01:27 +0200 Subject: [PATCH] Serialise image layout in CmdCopyBufferToImage properly --- renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp index f080c1dff..a95ad5fad 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp @@ -362,6 +362,8 @@ bool WrappedVulkan::Serialise_vkCmdCopyBufferToImage( if(m_State < WRITING) m_LastCmdBufferID = cmdid; + SERIALISE_ELEMENT(VkImageLayout, layout, destImageLayout); + SERIALISE_ELEMENT(uint32_t, count, regionCount); SERIALISE_ELEMENT_ARR(VkBufferImageCopy, regions, pRegions, count); @@ -373,7 +375,7 @@ bool WrappedVulkan::Serialise_vkCmdCopyBufferToImage( if(IsPartialCmd(cmdid) && InPartialRange()) { cmdBuffer = PartialCmdBuf(); - ObjDisp(cmdBuffer)->CmdCopyBufferToImage(Unwrap(cmdBuffer), Unwrap(srcBuffer), Unwrap(destImage), destImageLayout, count, regions); + ObjDisp(cmdBuffer)->CmdCopyBufferToImage(Unwrap(cmdBuffer), Unwrap(srcBuffer), Unwrap(destImage), layout, count, regions); } } else if(m_State == READING) @@ -382,7 +384,7 @@ bool WrappedVulkan::Serialise_vkCmdCopyBufferToImage( srcBuffer = GetResourceManager()->GetLiveHandle(bufid); destImage = GetResourceManager()->GetLiveHandle(imgid); - ObjDisp(cmdBuffer)->CmdCopyBufferToImage(Unwrap(cmdBuffer), Unwrap(srcBuffer), Unwrap(destImage), destImageLayout, count, regions); + ObjDisp(cmdBuffer)->CmdCopyBufferToImage(Unwrap(cmdBuffer), Unwrap(srcBuffer), Unwrap(destImage), layout, count, regions); const string desc = localSerialiser->GetDebugStr();