Fix rebase dev conflicts

Author: locke-lunarg

framework/decode/vulkan_replay_dump_resources_delegate.cpp

@@ -136,8 +136,7 @@ VkResult DefaultVulkanDumpResourcesDelegate::DumpRenderTargetImage(const VulkanD
                                    options_.dump_resources_dump_all_image_subresources,
                                    options_.dump_resources_dump_raw_images,
                                    options_.dump_resources_dump_separate_alpha,
-                                   VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
-                                   &resource_info.image_extent);
+                                   VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
 
     if (res != VK_SUCCESS)
     {
@@ -455,8 +454,10 @@ void DefaultVulkanDumpResourcesDelegate::GenerateOutputJsonDrawCallInfo(const Vu
     auto& current_block = dump_json_.GetCurrentSubEntry();
     auto& drawcall_json_entries =
         !options_.dump_resources_json_per_command ? current_block["drawCallCommands"] : current_block;
-    auto& draw_call_entry =
-        !options_.dump_resources_json_per_command ? drawcall_json_entries[index] : drawcall_json_entries;
+
+    static uint64_t unique_json_entry = 0;
+    auto&           draw_call_entry =
+        !options_.dump_resources_json_per_command ? drawcall_json_entries[unique_json_entry++] : drawcall_json_entries;
 
     draw_call_entry["drawIndex"]               = draw_call_info.cmd_index;
     draw_call_entry["beginCommandBufferIndex"] = draw_call_info.bcb_index;

framework/decode/vulkan_replay_dump_resources_delegate.h

@@ -72,7 +72,6 @@ struct VulkanDumpResourceInfo
     uint64_t sp; // subpass
 
     const VulkanImageInfo*  image_info;
-    VkExtent3D              image_extent;
     const VulkanBufferInfo* buffer_info;
     std::vector<uint8_t>    data;
 

framework/decode/vulkan_replay_dump_resources_draw_calls.cpp

@@ -1071,7 +1071,6 @@ VkResult DrawCallsDumpingContext::DumpRenderTargetAttachments(
     res_info_base.before_cmd                   = dump_resources_before && !(cmd_buf_index % 2);
     res_info_base.rp                           = rp;
     res_info_base.sp                           = sp;
-    res_info_base.image_extent                 = { render_area[rp].extent.width, render_area[rp].extent.height, 1 };
 
     // Dump color attachments
     for (size_t i = 0; i < render_targets[rp][sp].color_att_imgs.size(); ++i)
@@ -1624,8 +1623,8 @@ VkResult DrawCallsDumpingContext::DumpVertexIndexBuffers(uint64_t qs_index, uint
             // Parse all indices in order to find the smallest and greatest index
             for (const auto& pairs : index_count_first_index_pairs)
             {
-                const std::pair<uint32_t, uint32_t> min_max_indices =
-                    FindMinMaxVertexIndices(index_data, pairs.first, pairs.second, greatest_vertex_offset, index_type);
+                const std::pair<uint32_t, uint32_t> min_max_indices = FindMinMaxVertexIndices(
+                    res_info.data, pairs.first, pairs.second, greatest_vertex_offset, index_type);
                 if (min_max_indices.first < min_max_vertex_indices.first)
                 {
                     min_max_vertex_indices.first = min_max_indices.first;