lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-26 08:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to fetch resource ID from already unwrapped image

Browse Source
This commit is contained in:
baldurk
2017-11-09 15:10:05 +00:00
parent 401705ec15
commit 35801dcd72
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+9 -11
View File
@@ -1828,6 +1828,8 @@ bool WrappedVulkan::Serialise_vkCmdPipelineBarrier(
}
}
ResourceId origcmd = GetResourceManager()->GetOriginalID(GetResID(commandBuffer));
for(uint32_t i = 0; i < imageMemoryBarrierCount; i++)
{
if(pImageMemoryBarriers[i].image != VK_NULL_HANDLE)
@@ -1839,6 +1841,13 @@ bool WrappedVulkan::Serialise_vkCmdPipelineBarrier(
ReplaceExternalQueueFamily(imgBarriers.back().srcQueueFamilyIndex,
imgBarriers.back().dstQueueFamilyIndex);
if(IsLoading(m_State))
{
m_BakedCmdBufferInfo[origcmd].resourceUsage.push_back(std::make_pair(
GetResID(pImageMemoryBarriers[i].image),
EventUsage(m_BakedCmdBufferInfo[origcmd].curEventID, ResourceUsage::Barrier)));
}
}
}
@@ -1849,17 +1858,6 @@ bool WrappedVulkan::Serialise_vkCmdPipelineBarrier(
else
commandBuffer = VK_NULL_HANDLE;
}
else
{
ResourceId cmd = GetResourceManager()->GetOriginalID(GetResID(commandBuffer));
for(size_t i = 0; i < imgBarriers.size(); i++)
{
m_BakedCmdBufferInfo[cmd].resourceUsage.push_back(std::make_pair(
GetResID(imgBarriers[i].image),
EventUsage(m_BakedCmdBufferInfo[cmd].curEventID, ResourceUsage::Barrier)));
}
}
if(commandBuffer != VK_NULL_HANDLE)
{