Add block_index_ to metadata consumers

Author: NickDriscoll

framework/decode/metadata_consumer_base.h

@@ -34,6 +34,9 @@ GFXRECON_BEGIN_NAMESPACE(decode)
 /// implement to handle metacommands.
 class MetadataConsumerBase
 {
+  protected:
+    uint64_t block_index_;
+
   public:
     virtual void ProcessDisplayMessageCommand(const std::string& message) {}
     virtual void ProcessFillMemoryCommand(uint64_t memory_id, uint64_t offset, uint64_t size, const uint8_t* data) {}
@@ -103,6 +106,11 @@ class MetadataConsumerBase
     virtual void ProcessInitSubresourceCommand(const format::InitSubresourceCommandHeader& command_header,
                                                const uint8_t*                              data)
     {}
+
+    inline void SetCurrentBlockIndex(uint64_t block_index)
+    {
+      block_index_ = block_index;
+    }
 };
 
 GFXRECON_END_NAMESPACE(decode)

framework/decode/metadata_json_consumer.h

@@ -51,6 +51,7 @@ class MetadataJsonConsumer : public Base
     inline const util::JsonOptions& GetJsonOptions() const { return this->writer_->GetOptions(); } // temp
     inline nlohmann::ordered_json&  WriteMetaCommandStart(const std::string& command_name) const
     {
+        this->writer_->SetCurrentBlockIndex(block_index_);
         return this->writer_->WriteMetaCommandStart(command_name);
     }
     inline void WriteBlockEnd() { this->writer_->WriteBlockEnd(); }
@@ -260,6 +261,7 @@ class MetadataJsonConsumer : public Base
         RepresentBinaryFile(*(this->writer_), jdata[format::kNameData], "init_image.bin", data_size, data);
         WriteBlockEnd();
     }
+
     /// @}
 };