From 95a2dc1887edbcd89c340aa528bc284e7de9f1f5 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 30 Jun 2020 13:09:17 +0100 Subject: [PATCH] Always print the draw count for indirect draws --- renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp index ef8636886..9174a09c6 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp @@ -604,7 +604,7 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndirect(SerialiserType &ser, VkCommandBu m_IndirectBufferSize = RDCMAX(m_IndirectBufferSize, sizeof(VkDrawIndirectCommand) + (count > 0 ? count - 1 : 0) * stride); - rdcstr name = "vkCmdDrawIndirect"; + rdcstr name = StringFormat::Fmt("vkCmdDrawIndirect(%u)", count); if(!IsDrawInRenderPass()) { @@ -667,7 +667,6 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndirect(SerialiserType &ser, VkCommandBu if(count == 0) { draw.flags = DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indirect; - draw.name = name + "(0)"; } AddEvent(); @@ -987,7 +986,7 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndexedIndirect(SerialiserType &ser, m_IndirectBufferSize = RDCMAX(m_IndirectBufferSize, sizeof(VkDrawIndexedIndirectCommand) + (count > 0 ? count - 1 : 0) * stride); - rdcstr name = "vkCmdDrawIndexedIndirect"; + rdcstr name = StringFormat::Fmt("vkCmdDrawIndexedIndirect(%u)", count); if(!IsDrawInRenderPass()) { @@ -1050,7 +1049,7 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndexedIndirect(SerialiserType &ser, if(count == 0) { - draw.name = name + "(0)"; + draw.name = name; draw.flags = DrawFlags::Drawcall | DrawFlags::Instanced | DrawFlags::Indexed | DrawFlags::Indirect; }