Dump all subresources of render target images

LunarG · Aug 23, 2024 · 3684d42 · 3684d42
1 parent d2196b6
commit 3684d42
Show file tree

Hide file tree

Showing 7 changed files with 1,028 additions and 534 deletions.
diff --git a/framework/decode/vulkan_replay_dump_resources_common.cpp b/framework/decode/vulkan_replay_dump_resources_common.cpp
@@ -546,7 +546,6 @@ VkResult DumpImageToFile(const ImageInfo*                   image_info,
                 const uint32_t texel_size = vkuFormatElementSizeWithAspect(image_info->format, aspects[i]);
                 const uint32_t stride     = texel_size * scaled_extent.width;
 
-                filename += ImageFileExtension(image_info->format, image_file_format);
                 if (output_image_format == util::imagewriter::DataFormats::kFormat_ASTC)
                 {
                     VKU_FORMAT_INFO format_info = vkuGetFormatInfo(image_info->format);
@@ -628,7 +627,6 @@ VkResult DumpImageToFile(const ImageInfo*                   image_info,
                         const uint32_t texel_size = vkuFormatElementSizeWithAspect(image_info->format, aspect);
                         const uint32_t stride     = texel_size * scaled_extent.width;
 
-                        filename += ImageFileExtension(image_info->format, image_file_format);
                         if (output_image_format == util::imagewriter::DataFormats::kFormat_ASTC)
                         {
                             VKU_FORMAT_INFO format_info = vkuGetFormatInfo(image_info->format);

diff --git a/framework/decode/vulkan_replay_dump_resources_compute_ray_tracing.cpp b/framework/decode/vulkan_replay_dump_resources_compute_ray_tracing.cpp
diff --git a/framework/decode/vulkan_replay_dump_resources_compute_ray_tracing.h b/framework/decode/vulkan_replay_dump_resources_compute_ray_tracing.h
@@ -119,19 +119,19 @@ class DispatchTraceRaysDumpingContext
     void Release();
 
   private:
-    std::vector<std::string> GenerateDispatchTraceRaysImageFilename(VkFormat              format,
-                                                                    uint32_t              levels,
-                                                                    uint32_t              layers,
-                                                                    bool                  is_dispatch,
-                                                                    uint64_t              qs_index,
-                                                                    uint64_t              bcb_index,
-                                                                    uint64_t              cmd_index,
-                                                                    uint32_t              desc_set,
-                                                                    uint32_t              desc_binding,
-                                                                    uint32_t              array_index,
-                                                                    VkShaderStageFlagBits stage,
-                                                                    bool                  before_cmd,
-                                                                    bool                  dump_all_subresources) const;
+    std::string GenerateDispatchTraceRaysImageFilename(VkFormat              format,
+                                                       uint32_t              mip,
+                                                       uint32_t              layer,
+                                                       VkImageAspectFlagBits aspect,
+                                                       bool                  is_dispatch,
+                                                       uint64_t              qs_index,
+                                                       uint64_t              bcb_index,
+                                                       uint64_t              cmd_index,
+                                                       uint32_t              desc_set,
+                                                       uint32_t              desc_binding,
+                                                       uint32_t              array_index,
+                                                       VkShaderStageFlagBits stage,
+                                                       bool                  before_cmd) const;
 
     std::string GenerateDispatchTraceRaysBufferFilename(bool                  is_dispatch,
                                                         uint64_t              qs_index,
@@ -143,8 +143,13 @@ class DispatchTraceRaysDumpingContext
                                                         VkShaderStageFlagBits stage,
                                                         bool                  before_cmd) const;
 
-    std::vector<std::string>
-    GenerateImageDescriptorFilename(uint64_t bcb_index, uint64_t cmd_index, const ImageInfo* img_info) const;
+    std::string GenerateImageDescriptorFilename(VkFormat              format,
+                                                uint32_t              mip,
+                                                uint32_t              layer,
+                                                format::HandleId      image_id,
+                                                VkImageAspectFlagBits aspect,
+                                                uint64_t              bcb_index,
+                                                uint64_t              cmd_index) const;
 
     std::string
     GenerateBufferDescriptorFilename(uint64_t bcb_index, uint64_t cmd_index, format::HandleId buffer_id) const;