Each output json gen func keeps its own index

panos-lunarg · locke-lunarg · commit 61c775cb5472 · 2025-01-14T14:49:28.000-07:00
diff --git a/framework/decode/vulkan_replay_dump_resources_compute_ray_tracing.cpp b/framework/decode/vulkan_replay_dump_resources_compute_ray_tracing.cpp
@@ -882,7 +882,7 @@ VkResult DispatchTraceRaysDumpingContext::DumpDispatchTraceRays(
         GFXRECON_ASSERT(dispatch_param_entry != dispatch_params.end());
         draw_call_info.disp_param = &dispatch_param_entry->second;
 
-        delegate_.DumpDrawCallInfo(draw_call_info, i);
+        delegate_.DumpDrawCallInfo(draw_call_info);
     }
 
     for (size_t i = 0; i < trace_rays_indices.size(); ++i)
@@ -924,7 +924,7 @@ VkResult DispatchTraceRaysDumpingContext::DumpDispatchTraceRays(
         GFXRECON_ASSERT(trace_rays_param_entry != trace_rays_params.end());
         draw_call_info.tr_param = &trace_rays_param_entry->second;
 
-        delegate_.DumpDrawCallInfo(draw_call_info, i);
+        delegate_.DumpDrawCallInfo(draw_call_info);
     }
 
     // Clean up references to dumped descriptors in case this command buffer is submitted again
diff --git a/framework/decode/vulkan_replay_dump_resources_delegate.cpp b/framework/decode/vulkan_replay_dump_resources_delegate.cpp
@@ -27,18 +27,18 @@
 GFXRECON_BEGIN_NAMESPACE(gfxrecon)
 GFXRECON_BEGIN_NAMESPACE(decode)
 
-void DefaultVulkanDumpResourcesDelegate::DumpDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info, size_t index)
+void DefaultVulkanDumpResourcesDelegate::DumpDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info)
 {
     switch (draw_call_info.type)
     {
         case DumpResourceType::kDrawCallInfo:
-            GenerateOutputJsonDrawCallInfo(draw_call_info, index);
+            GenerateOutputJsonDrawCallInfo(draw_call_info);
             break;
         case DumpResourceType::kDispatchInfo:
-            GenerateOutputJsonDispatchInfo(draw_call_info, index);
+            GenerateOutputJsonDispatchInfo(draw_call_info);
             break;
         case DumpResourceType::kTraceRaysIndex:
-            GenerateOutputJsonTraceRaysIndex(draw_call_info, index);
+            GenerateOutputJsonTraceRaysIndex(draw_call_info);
             break;
         default:
             break;
@@ -434,8 +434,7 @@ DefaultVulkanDumpResourcesDelegate::GenerateIndexBufferFilename(const VulkanDump
     return (filedirname / filebasename).string();
 }
 
-void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info,
-                                                                        size_t                        index)
+void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info)
 {
     if (options_.dump_resources_json_per_command)
     {
@@ -1251,8 +1250,7 @@ std::string DefaultVulkanDumpResourcesDelegate::GenerateDispatchTraceRaysInlineU
     return (filedirname / filebasename).string();
 }
 
-void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDispatchInfo(const VulkanDumpDrawCallInfo& draw_call_info,
-                                                                        size_t                        index)
+void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDispatchInfo(const VulkanDumpDrawCallInfo& draw_call_info)
 {
     if (draw_call_info.disp_param == nullptr)
     {
@@ -1275,8 +1273,10 @@ void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDispatchInfo(const Vu
     auto& current_block = dump_json_.GetCurrentSubEntry();
     auto& dispatch_json_entries =
         !options_.dump_resources_json_per_command ? current_block["dispatchCommands"] : dump_json_.GetData();
+
+    static uint64_t unique_json_entry = 0;
     auto& dispatch_json_entry =
-        !options_.dump_resources_json_per_command ? dispatch_json_entries[index] : dump_json_.GetData();
+        !options_.dump_resources_json_per_command ? dispatch_json_entries[unique_json_entry++] : dump_json_.GetData();
 
     dispatch_json_entry["dispatchIndex"]           = draw_call_info.cmd_index;
     dispatch_json_entry["beginCommandBufferIndex"] = draw_call_info.bcb_index;
@@ -1715,8 +1715,7 @@ void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDispatchInfo(const Vu
     }
 }
 
-void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonTraceRaysIndex(const VulkanDumpDrawCallInfo& draw_call_info,
-                                                                          size_t                        index)
+void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonTraceRaysIndex(const VulkanDumpDrawCallInfo& draw_call_info)
 {
     if (draw_call_info.tr_param == nullptr)
     {
@@ -1739,7 +1738,9 @@ void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonTraceRaysIndex(const
         dump_json_.Open(full_filename);
         dump_json_.BlockStart();
     }
-    auto& tr_entry = !options_.dump_resources_json_per_command ? tr_json_entries[index] : dump_json_.GetData();
+
+    static uint64_t unique_json_entry = 0;
+    auto& tr_entry = !options_.dump_resources_json_per_command ? tr_json_entries[unique_json_entry++] : dump_json_.GetData();
 
     tr_entry["traceRaysIndex"]          = draw_call_info.cmd_index;
     tr_entry["beginCommandBufferIndex"] = draw_call_info.bcb_index;
diff --git a/framework/decode/vulkan_replay_dump_resources_delegate.h b/framework/decode/vulkan_replay_dump_resources_delegate.h
@@ -107,12 +107,12 @@ class VulkanDumpResourcesDelegate
     VulkanDumpResourcesDelegate(const VulkanReplayOptions& options, const std::string capture_filename) {}
     virtual ~VulkanDumpResourcesDelegate() {}
 
-    virtual bool     Open()                                                                       = 0;
-    virtual void     DumpDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info, size_t index) = 0;
-    virtual void     DumpStart()                                                                  = 0;
-    virtual VkResult DumpResource(const VulkanDumpResourceInfo& resource_info)                    = 0;
-    virtual void     DumpEnd()                                                                    = 0;
-    virtual void     Close()                                                                      = 0;
+    virtual bool     Open()                                                         = 0;
+    virtual void     DumpDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info) = 0;
+    virtual void     DumpStart()                                                    = 0;
+    virtual VkResult DumpResource(const VulkanDumpResourceInfo& resource_info)      = 0;
+    virtual void     DumpEnd()                                                      = 0;
+    virtual void     Close()                                                        = 0;
 };
 
 class DefaultVulkanDumpResourcesDelegate : public VulkanDumpResourcesDelegate
@@ -129,7 +129,7 @@ class DefaultVulkanDumpResourcesDelegate : public VulkanDumpResourcesDelegate
         return dump_json_.Open(options_.capture_filename, options_.dump_resources_output_dir);
     }
 
-    virtual void DumpDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info, size_t index) override;
+    virtual void DumpDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info) override;
 
     virtual void DumpStart() override { dump_json_.BlockStart(); }
 
@@ -171,7 +171,7 @@ class DefaultVulkanDumpResourcesDelegate : public VulkanDumpResourcesDelegate
 
     std::string GenerateIndexBufferFilename(const VulkanDumpResourceInfo& resource_info) const;
 
-    void GenerateOutputJsonDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info, size_t index);
+    void GenerateOutputJsonDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info);
 
     // DispatchTraceRaysDumpingContext
     VkResult DumpeDispatchTraceRaysImage(const VulkanDumpResourceInfo& resource_info);
@@ -201,9 +201,9 @@ class DefaultVulkanDumpResourcesDelegate : public VulkanDumpResourcesDelegate
     std::string
     GenerateDispatchTraceRaysInlineUniformBufferDescriptorFilename(const VulkanDumpResourceInfo& resource_info) const;
 
-    void GenerateOutputJsonDispatchInfo(const VulkanDumpDrawCallInfo& draw_call_info, size_t index);
+    void GenerateOutputJsonDispatchInfo(const VulkanDumpDrawCallInfo& draw_call_info);
 
-    void GenerateOutputJsonTraceRaysIndex(const VulkanDumpDrawCallInfo& draw_call_info, size_t index);
+    void GenerateOutputJsonTraceRaysIndex(const VulkanDumpDrawCallInfo& draw_call_info);
 
     // Keep track of images for which scalling failed so we can
     // note them in the output json
diff --git a/framework/decode/vulkan_replay_dump_resources_draw_calls.cpp b/framework/decode/vulkan_replay_dump_resources_draw_calls.cpp
@@ -879,7 +879,7 @@ VkResult DrawCallsDumpingContext::DumpDrawCalls(
             GFXRECON_ASSERT(dc_param_entry != draw_call_params.end());
             draw_call_info.dc_param = &dc_param_entry->second;
 
-            delegate_.DumpDrawCallInfo(draw_call_info, cb);
+            delegate_.DumpDrawCallInfo(draw_call_info);
         }
 
         res = RevertRenderTargetImageLayouts(queue, cb);

Original file line number	Diff line number	Diff line change
`@@ -882,7 +882,7 @@ VkResult DispatchTraceRaysDumpingContext::DumpDispatchTraceRays(`
`882`	`882`	`GFXRECON_ASSERT(dispatch_param_entry != dispatch_params.end());`
`883`	`883`	`draw_call_info.disp_param = &dispatch_param_entry->second;`
`884`	`884`
`885`		`- delegate_.DumpDrawCallInfo(draw_call_info, i);`
	`885`	`+ delegate_.DumpDrawCallInfo(draw_call_info);`
`886`	`886`	`}`
`887`	`887`
`888`	`888`	`for (size_t i = 0; i < trace_rays_indices.size(); ++i)`
`@@ -924,7 +924,7 @@ VkResult DispatchTraceRaysDumpingContext::DumpDispatchTraceRays(`
`924`	`924`	`GFXRECON_ASSERT(trace_rays_param_entry != trace_rays_params.end());`
`925`	`925`	`draw_call_info.tr_param = &trace_rays_param_entry->second;`
`926`	`926`
`927`		`- delegate_.DumpDrawCallInfo(draw_call_info, i);`
	`927`	`+ delegate_.DumpDrawCallInfo(draw_call_info);`
`928`	`928`	`}`
`929`	`929`
`930`	`930`	`// Clean up references to dumped descriptors in case this command buffer is submitted again`
Original file line number	Diff line number	Diff line change
`@@ -27,18 +27,18 @@`
`27`	`27`	`GFXRECON_BEGIN_NAMESPACE(gfxrecon)`
`28`	`28`	`GFXRECON_BEGIN_NAMESPACE(decode)`
`29`	`29`
`30`		`-void DefaultVulkanDumpResourcesDelegate::DumpDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info, size_t index)`
	`30`	`+void DefaultVulkanDumpResourcesDelegate::DumpDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info)`
`31`	`31`	`{`
`32`	`32`	`switch (draw_call_info.type)`
`33`	`33`	`{`
`34`	`34`	`case DumpResourceType::kDrawCallInfo:`
`35`		`- GenerateOutputJsonDrawCallInfo(draw_call_info, index);`
	`35`	`+ GenerateOutputJsonDrawCallInfo(draw_call_info);`
`36`	`36`	`break;`
`37`	`37`	`case DumpResourceType::kDispatchInfo:`
`38`		`- GenerateOutputJsonDispatchInfo(draw_call_info, index);`
	`38`	`+ GenerateOutputJsonDispatchInfo(draw_call_info);`
`39`	`39`	`break;`
`40`	`40`	`case DumpResourceType::kTraceRaysIndex:`
`41`		`- GenerateOutputJsonTraceRaysIndex(draw_call_info, index);`
	`41`	`+ GenerateOutputJsonTraceRaysIndex(draw_call_info);`
`42`	`42`	`break;`
`43`	`43`	`default:`
`44`	`44`	`break;`
`@@ -434,8 +434,7 @@ DefaultVulkanDumpResourcesDelegate::GenerateIndexBufferFilename(const VulkanDump`
`434`	`434`	`return (filedirname / filebasename).string();`
`435`	`435`	`}`
`436`	`436`
`437`		`-void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info,`
`438`		`- size_t index)`
	`437`	`+void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDrawCallInfo(const VulkanDumpDrawCallInfo& draw_call_info)`
`439`	`438`	`{`
`440`	`439`	`if (options_.dump_resources_json_per_command)`
`441`	`440`	`{`
`@@ -1251,8 +1250,7 @@ std::string DefaultVulkanDumpResourcesDelegate::GenerateDispatchTraceRaysInlineU`
`1251`	`1250`	`return (filedirname / filebasename).string();`
`1252`	`1251`	`}`
`1253`	`1252`
`1254`		`-void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDispatchInfo(const VulkanDumpDrawCallInfo& draw_call_info,`
`1255`		`- size_t index)`
	`1253`	`+void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDispatchInfo(const VulkanDumpDrawCallInfo& draw_call_info)`
`1256`	`1254`	`{`
`1257`	`1255`	`if (draw_call_info.disp_param == nullptr)`
`1258`	`1256`	`{`
`@@ -1275,8 +1273,10 @@ void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDispatchInfo(const Vu`
`1275`	`1273`	`auto& current_block = dump_json_.GetCurrentSubEntry();`
`1276`	`1274`	`auto& dispatch_json_entries =`
`1277`	`1275`	`!options_.dump_resources_json_per_command ? current_block["dispatchCommands"] : dump_json_.GetData();`
	`1276`	`+`
	`1277`	`+ static uint64_t unique_json_entry = 0;`
`1278`	`1278`	`auto& dispatch_json_entry =`
`1279`		`- !options_.dump_resources_json_per_command ? dispatch_json_entries[index] : dump_json_.GetData();`
	`1279`	`+ !options_.dump_resources_json_per_command ? dispatch_json_entries[unique_json_entry++] : dump_json_.GetData();`
`1280`	`1280`
`1281`	`1281`	`dispatch_json_entry["dispatchIndex"] = draw_call_info.cmd_index;`
`1282`	`1282`	`dispatch_json_entry["beginCommandBufferIndex"] = draw_call_info.bcb_index;`
`@@ -1715,8 +1715,7 @@ void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDispatchInfo(const Vu`
`1715`	`1715`	`}`
`1716`	`1716`	`}`
`1717`	`1717`
`1718`		`-void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonTraceRaysIndex(const VulkanDumpDrawCallInfo& draw_call_info,`
`1719`		`- size_t index)`
	`1718`	`+void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonTraceRaysIndex(const VulkanDumpDrawCallInfo& draw_call_info)`
`1720`	`1719`	`{`
`1721`	`1720`	`if (draw_call_info.tr_param == nullptr)`
`1722`	`1721`	`{`
`@@ -1739,7 +1738,9 @@ void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonTraceRaysIndex(const`
`1739`	`1738`	`dump_json_.Open(full_filename);`
`1740`	`1739`	`dump_json_.BlockStart();`
`1741`	`1740`	`}`
`1742`		`- auto& tr_entry = !options_.dump_resources_json_per_command ? tr_json_entries[index] : dump_json_.GetData();`
	`1741`	`+`
	`1742`	`+ static uint64_t unique_json_entry = 0;`
	`1743`	`+ auto& tr_entry = !options_.dump_resources_json_per_command ? tr_json_entries[unique_json_entry++] : dump_json_.GetData();`
`1743`	`1744`
`1744`	`1745`	`tr_entry["traceRaysIndex"] = draw_call_info.cmd_index;`
`1745`	`1746`	`tr_entry["beginCommandBufferIndex"] = draw_call_info.bcb_index;`
Original file line number	Diff line number	Diff line change
`@@ -879,7 +879,7 @@ VkResult DrawCallsDumpingContext::DumpDrawCalls(`
`879`	`879`	`GFXRECON_ASSERT(dc_param_entry != draw_call_params.end());`
`880`	`880`	`draw_call_info.dc_param = &dc_param_entry->second;`
`881`	`881`
`882`		`- delegate_.DumpDrawCallInfo(draw_call_info, cb);`
	`882`	`+ delegate_.DumpDrawCallInfo(draw_call_info);`
`883`	`883`	`}`
`884`	`884`
`885`	`885`	`res = RevertRenderTargetImageLayouts(queue, cb);`