Add ags to convert tool

framework/decode/CMakeLists.txt

@@ -216,6 +216,8 @@ target_sources(gfxrecon_decode
                     ${CMAKE_CURRENT_LIST_DIR}/custom_ags_consumer_base.h
                     ${CMAKE_CURRENT_LIST_DIR}/custom_ags_replay_consumer.h
                     ${CMAKE_CURRENT_LIST_DIR}/custom_ags_replay_consumer.cpp
+                    ${CMAKE_CURRENT_LIST_DIR}/custom_ags_ascii_consumer.h
+                    ${CMAKE_CURRENT_LIST_DIR}/custom_ags_ascii_consumer.cpp
                     ${CMAKE_CURRENT_LIST_DIR}/ags_detection_consumer.h
                )
 endif()

framework/decode/custom_ags_consumer_base.h

@@ -92,6 +92,11 @@ class AgsConsumerBase
                                                            AGSContext*        context,
                                                            format::HandleId   object_id,
                                                            const char*        data) = 0;
+
+    void SetCurrentBlockIndex(uint64_t index) { current_block_index_ = index; }
+
+  protected:
+    uint64_t current_block_index_{ 0 };
 };
 
 GFXRECON_END_NAMESPACE(decode)

framework/decode/custom_ags_decoder.cpp

@@ -41,6 +41,14 @@ bool AgsDecoder::SupportsApiCall(format::ApiCallId call_id)
     return (family_id == format::ApiFamilyId::ApiFamily_AGS);
 }
 
+void AgsDecoder::SetCurrentBlockIndex(uint64_t block_index)
+{
+    for (auto consumer : consumers_)
+    {
+        consumer->SetCurrentBlockIndex(block_index);
+    }
+}
+
 void AgsDecoder::DecodeFunctionCall(format::ApiCallId  call_id,
                                     const ApiCallInfo& call_info,
                                     const uint8_t*     parameter_buffer,

framework/decode/custom_ags_decoder.h

@@ -166,7 +166,7 @@ class AgsDecoder : public ApiDecoder
                                                 const uint8_t*                              data) override
     {}
 
-    virtual void SetCurrentBlockIndex(uint64_t block_index) override {}
+    virtual void SetCurrentBlockIndex(uint64_t block_index) override;
 
     virtual void DecodeFunctionCall(format::ApiCallId  call_id,
                                     const ApiCallInfo& call_options,

framework/decode/dx12_ascii_consumer_base.h

@@ -1,5 +1,6 @@
 /*
 ** Copyright (c) 2021-2023 LunarG, Inc.
+** Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and associated documentation files (the "Software"),
@@ -100,7 +101,7 @@ class Dx12AsciiConsumerBase : public Dx12Consumer
             [&](std::stringstream& strStrm)
             {
                 // Output the API call index
-                FieldToString(strStrm, true, "index", to_string_flags_, tabCount, tabSize, ToString(api_call_count_++, to_string_flags_, tabCount, tabSize));
+                FieldToString(strStrm, true, "index", to_string_flags_, tabCount, tabSize, ToString(GetCurrentBlockIndex(), to_string_flags_, tabCount, tabSize));
 
                 // Output the method/function name
                 assert(writeApiCallToFileInfo.pFunctionName);
@@ -145,7 +146,6 @@ class Dx12AsciiConsumerBase : public Dx12Consumer
   private:
     FILE*       file_{ nullptr };
     std::string filename_;
-    uint64_t    api_call_count_{ 0 };
 };
 
 GFXRECON_END_NAMESPACE(decode)

framework/decode/dx12_consumer_base.h

@@ -1,5 +1,6 @@
 /*
-** Copyright (c) 2021 LunarG, Inc.
+** Copyright (c) 2021-2023 LunarG, Inc.
+** Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and associated documentation files (the "Software"),

framework/decode/file_processor.cpp

@@ -42,7 +42,7 @@ const uint32_t kFirstFrame = 0;
 FileProcessor::FileProcessor() :
     file_header_{}, file_descriptor_(nullptr), current_frame_number_(kFirstFrame), bytes_read_(0),
     error_state_(kErrorInvalidFileDescriptor), annotation_handler_(nullptr), compressor_(nullptr), block_index_(0),
-    api_call_index_(0), block_limit_(0), capture_uses_frame_markers_(false), first_frame_(kFirstFrame + 1)
+    block_limit_(0), capture_uses_frame_markers_(false), first_frame_(kFirstFrame + 1)
 {}
 
 FileProcessor::FileProcessor(uint64_t block_limit) : FileProcessor()
@@ -651,8 +651,6 @@ bool FileProcessor::ProcessMethodCall(const format::BlockHeader& block_header, f
                     DecodeAllocator::End();
                 }
             }
-
-            ++api_call_index_;
         }
     }
     else

tools/convert/main.cpp

@@ -1,7 +1,7 @@
 /*
 ** Copyright (c) 2018-2023 Valve Corporation
 ** Copyright (c) 2018-2023 LunarG, Inc.
-** Copyright (c) 2020 Advanced Micro Devices, Inc.
+** Copyright (c) 2020-2023 Advanced Micro Devices, Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and associated documentation files (the "Software"),
@@ -31,6 +31,11 @@
 #include "generated/generated_vulkan_export_json_consumer.h"
 #if defined(CONVERT_EXPERIMENTAL_D3D12)
 #include "generated/generated_dx12_ascii_consumer.h"
+#ifdef GFXRECON_AGS_SUPPORT
+#include "decode/custom_ags_consumer_base.h"
+#include "decode/custom_ags_decoder.h"
+#include "decode/custom_ags_ascii_consumer.h"
+#endif // GFXRECON_AGS_SUPPORT
 #endif
 
 using gfxrecon::decode::JsonFormat;
@@ -270,6 +275,18 @@ int main(int argc, const char** argv)
             auto dx12_json_flags = output_format == JsonFormat::JSON ? gfxrecon::util::kToString_Formatted
                                                                      : gfxrecon::util::kToString_Unformatted;
             dx12_ascii_consumer.Initialize(out_file_handle, dx12_json_flags);
+
+#ifdef GFXRECON_AGS_SUPPORT
+            gfxrecon::decode::AgsAsciiConsumer ags_ascii_consumer;
+            ags_ascii_consumer.Initialize(out_file_handle, dx12_json_flags);
+
+            gfxrecon::decode::AgsDecoder ags_decoder;
+
+            ags_decoder.AddConsumer(&ags_ascii_consumer);
+
+            file_processor.AddDecoder(&ags_decoder);
+#endif // GFXRECON_AGS_SUPPORT
+
 #endif
 
             while (success)