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

Patch some missing pieces after removing draws from a DrawIndirect

Browse Source
This commit is contained in:
baldurk
2018-11-19 12:07:42 +00:00
parent 94ed33accb
commit e88169cbfe
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.h
+1 -1
View File
@@ -809,7 +809,7 @@ private:
bool PatchIndirectDraw(VkIndirectPatchType type, DrawcallDescription &draw, byte *&argptr,
byte *argend);
void InsertDrawsAndRefreshIDs(vector<VulkanDrawcallTreeNode> &cmdBufNodes);
void InsertDrawsAndRefreshIDs(BakedCmdBufferInfo &cmdBufInfo);
list<VulkanDrawcallTreeNode *> m_DrawcallStack;
renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+13 -2
View File
@@ -269,7 +269,7 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(SerialiserType &ser, VkQueue queue,
// insert the baked command buffer in-line into this list of notes, assigning new event
// and drawIDs
InsertDrawsAndRefreshIDs(cmdBufInfo.draw->children);
InsertDrawsAndRefreshIDs(cmdBufInfo);
for(size_t e = 0; e < cmdBufInfo.draw->executedCmds.size(); e++)
{
@@ -515,8 +515,10 @@ bool WrappedVulkan::PatchIndirectDraw(VkIndirectPatchType type, DrawcallDescript
return valid;
}
void WrappedVulkan::InsertDrawsAndRefreshIDs(vector<VulkanDrawcallTreeNode> &cmdBufNodes)
void WrappedVulkan::InsertDrawsAndRefreshIDs(BakedCmdBufferInfo &cmdBufInfo)
{
vector<VulkanDrawcallTreeNode> &cmdBufNodes = cmdBufInfo.draw->children;
// assign new drawcall IDs
for(size_t i = 0; i < cmdBufNodes.size(); i++)
{
@@ -605,6 +607,15 @@ void WrappedVulkan::InsertDrawsAndRefreshIDs(vector<VulkanDrawcallTreeNode> &cmd
for(APIEvent &ev : cmdBufNodes[j].draw.events)
ev.eventId -= shiftCount;
}
cmdBufInfo.eventCount -= shiftCount;
cmdBufInfo.drawCount -= shiftCount;
for(size_t j = 0; j < cmdBufInfo.debugMessages.size(); j++)
{
if(cmdBufInfo.debugMessages[j].eventId >= cmdBufNodes[i].draw.eventId + indirectCount + 2)
cmdBufInfo.debugMessages[j].eventId -= shiftCount;
}
}
// indirect count versions always have a multidraw marker regions, but static count of 1 would