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

Fix action patching of indirect mesh draws

Browse Source
This commit is contained in:
baldurk
2024-11-04 13:27:14 +00:00
parent ac482e7dd1
commit 4fbce3b662
1 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+10 -22
View File
@@ -520,7 +520,7 @@ bool WrappedVulkan::PatchIndirectDraw(size_t drawIndex, uint32_t paramStride,
action.drawIndex = (uint32_t)drawIndex;
if(type == VkIndirectPatchType::MeshIndirectCount)
if(type == VkIndirectPatchType::MeshIndirect || type == VkIndirectPatchType::MeshIndirectCount)
{
if(argptr && argptr + sizeof(VkDrawMeshTasksIndirectCommandEXT) <= argend)
{
@@ -617,6 +617,12 @@ bool WrappedVulkan::PatchIndirectDraw(size_t drawIndex, uint32_t paramStride,
sub->data.basic.u = action.indexOffset;
if(SDObject *sub = command->FindChild("firstInstance"))
sub->data.basic.u = action.instanceOffset;
if(SDObject *sub = command->FindChild("groupCountX"))
sub->data.basic.u = action.dispatchDimension[0];
if(SDObject *sub = command->FindChild("groupCountY"))
sub->data.basic.u = action.dispatchDimension[1];
if(SDObject *sub = command->FindChild("groupCountZ"))
sub->data.basic.u = action.dispatchDimension[2];
}
}
@@ -653,29 +659,10 @@ void WrappedVulkan::InsertActionsAndRefreshIDs(BakedCmdBufferInfo &cmdBufInfo)
n.action.dispatchDimension[1] = args->y;
n.action.dispatchDimension[2] = args->z;
}
else if(n.indirectPatch.type == VkIndirectPatchType::MeshIndirect)
{
VkDrawMeshTasksIndirectCommandEXT unknown = {0};
bytebuf argbuf;
GetDebugManager()->GetBufferData(GetResID(n.indirectPatch.buf), 0, 0, argbuf);
VkDrawMeshTasksIndirectCommandEXT *args = (VkDrawMeshTasksIndirectCommandEXT *)&argbuf[0];
if(argbuf.size() < sizeof(VkDrawMeshTasksIndirectCommandEXT))
{
RDCERR("Couldn't fetch arguments buffer for vkCmdDrawMeshTasksIndirectEXT");
args = &unknown;
}
n.action.customName =
StringFormat::Fmt("vkCmdDrawMeshTasksIndirectEXT(<%u, %u, %u>)", args->groupCountX,
args->groupCountY, args->groupCountZ);
n.action.dispatchDimension[0] = args->groupCountX;
n.action.dispatchDimension[1] = args->groupCountY;
n.action.dispatchDimension[2] = args->groupCountZ;
}
else if(n.indirectPatch.type == VkIndirectPatchType::DrawIndirectByteCount ||
n.indirectPatch.type == VkIndirectPatchType::DrawIndirect ||
n.indirectPatch.type == VkIndirectPatchType::DrawIndexedIndirect ||
n.indirectPatch.type == VkIndirectPatchType::MeshIndirect ||
n.indirectPatch.type == VkIndirectPatchType::DrawIndirectCount ||
n.indirectPatch.type == VkIndirectPatchType::DrawIndexedIndirectCount ||
n.indirectPatch.type == VkIndirectPatchType::MeshIndirectCount)
@@ -843,7 +830,8 @@ void WrappedVulkan::InsertActionsAndRefreshIDs(BakedCmdBufferInfo &cmdBufInfo)
name = GetStructuredFile()->chunks[n2.action.events.back().chunkIndex]->name;
if(n.indirectPatch.type == VkIndirectPatchType::MeshIndirectCount)
if(n.indirectPatch.type == VkIndirectPatchType::MeshIndirect ||
n.indirectPatch.type == VkIndirectPatchType::MeshIndirectCount)
{
if(valid)
n2.action.customName = StringFormat::Fmt(