From d0e415ea9300bfed8321795b5867b302531c214c Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 12 Dec 2024 14:07:37 +0000 Subject: [PATCH] Fix formatting of single-count indirect mesh draws --- .../driver/vulkan/wrappers/vk_queue_funcs.cpp | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp index b1b5c5dcf..a124f234a 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp @@ -800,11 +800,24 @@ void WrappedVulkan::InsertActionsAndRefreshIDs(BakedCmdBufferInfo &cmdBufInfo) // if the actual action count was greater than 1, display this as an indirect count const char *countString = (n.indirectPatch.count > 1 ? "<1>" : "1"); - if(valid) - n.action.customName = StringFormat::Fmt("%s(%s) => <%u, %u>", name.c_str(), countString, - n.action.numIndices, n.action.numInstances); + if(n.indirectPatch.type == VkIndirectPatchType::MeshIndirect || + n.indirectPatch.type == VkIndirectPatchType::MeshIndirectCount) + { + if(valid) + n.action.customName = StringFormat::Fmt( + "%s(%s) => <%u, %u, %u>", name.c_str(), countString, n.action.dispatchDimension[0], + n.action.dispatchDimension[1], n.action.dispatchDimension[2]); + else + n.action.customName = StringFormat::Fmt("%s(%s) => ", name.c_str(), countString); + } else - n.action.customName = StringFormat::Fmt("%s(%s) => ", name.c_str(), countString); + { + if(valid) + n.action.customName = StringFormat::Fmt("%s(%s) => <%u, %u>", name.c_str(), countString, + n.action.numIndices, n.action.numInstances); + else + n.action.customName = StringFormat::Fmt("%s(%s) => ", name.c_str(), countString); + } } else {