Initial support for D3D11

framework/decode/CMakeLists.txt

@@ -56,6 +56,7 @@ target_sources(gfxrecon_decode
                     ${CMAKE_CURRENT_LIST_DIR}/info_consumer.h
                     ${CMAKE_CURRENT_LIST_DIR}/info_decoder.h
                     ${CMAKE_CURRENT_LIST_DIR}/info_decoder.cpp
+                    $<$<BOOL:${D3D12_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/dx_feature_data_decoder.h>
                     $<$<BOOL:${D3D12_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/dx_replay_options.h>
                     $<$<BOOL:${D3D12_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/dx12_optimize_options.h>
                     $<$<BOOL:${D3D12_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/dx12_object_info.h>

framework/decode/custom_dx12_struct_decoders.h

@@ -1,5 +1,6 @@
 /*
 ** Copyright (c) 2021 LunarG, Inc.
+** Copyright (c) 2023 Qualcomm Innovation Center, 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"),
@@ -31,6 +32,7 @@
 #include "util/defines.h"
 
 #include <d3d12.h>
+#include <d3d11.h>
 
 GFXRECON_BEGIN_NAMESPACE(gfxrecon)
 GFXRECON_BEGIN_NAMESPACE(decode)
@@ -298,6 +300,173 @@ struct Decoded_D3D12_SAMPLER_DESC2
     PointerDecoder<float> FloatBorderColor;
 };
 
+struct Decoded_D3D11_SUBRESOURCE_DATA
+{
+    using struct_type = D3D11_SUBRESOURCE_DATA;
+
+    D3D11_SUBRESOURCE_DATA* decoded_value{ nullptr };
+    PointerDecoder<uint8_t> pSysMem;
+};
+
+struct Decoded_D3D11_BUFFER_SRV
+{
+    using struct_type = D3D11_BUFFER_SRV;
+
+    D3D11_BUFFER_SRV* decoded_value{ nullptr };
+};
+
+struct Decoded_D3D11_SHADER_RESOURCE_VIEW_DESC
+{
+    using struct_type = D3D11_SHADER_RESOURCE_VIEW_DESC;
+
+    D3D11_SHADER_RESOURCE_VIEW_DESC* decoded_value{ nullptr };
+    Decoded_D3D11_BUFFER_SRV*        Buffer{ nullptr };
+    Decoded_D3D11_TEX1D_SRV*         Texture1D{ nullptr };
+    Decoded_D3D11_TEX1D_ARRAY_SRV*   Texture1DArray{ nullptr };
+    Decoded_D3D11_TEX2D_SRV*         Texture2D{ nullptr };
+    Decoded_D3D11_TEX2D_ARRAY_SRV*   Texture2DArray{ nullptr };
+    Decoded_D3D11_TEX2DMS_SRV*       Texture2DMS{ nullptr };
+    Decoded_D3D11_TEX2DMS_ARRAY_SRV* Texture2DMSArray{ nullptr };
+    Decoded_D3D11_TEX3D_SRV*         Texture3D{ nullptr };
+    Decoded_D3D11_TEXCUBE_SRV*       TextureCube{ nullptr };
+    Decoded_D3D11_TEXCUBE_ARRAY_SRV* TextureCubeArray{ nullptr };
+    Decoded_D3D11_BUFFEREX_SRV*      BufferEx{ nullptr };
+};
+
+struct Decoded_D3D11_BUFFER_RTV
+{
+    using struct_type = D3D11_BUFFER_RTV;
+
+    D3D11_BUFFER_RTV* decoded_value{ nullptr };
+};
+
+struct Decoded_D3D11_UNORDERED_ACCESS_VIEW_DESC
+{
+    using struct_type = D3D11_UNORDERED_ACCESS_VIEW_DESC;
+
+    D3D11_UNORDERED_ACCESS_VIEW_DESC* decoded_value{ nullptr };
+    Decoded_D3D11_BUFFER_UAV*         Buffer{ nullptr };
+    Decoded_D3D11_TEX1D_UAV*          Texture1D{ nullptr };
+    Decoded_D3D11_TEX1D_ARRAY_UAV*    Texture1DArray{ nullptr };
+    Decoded_D3D11_TEX2D_UAV*          Texture2D{ nullptr };
+    Decoded_D3D11_TEX2D_ARRAY_UAV*    Texture2DArray{ nullptr };
+    Decoded_D3D11_TEX3D_UAV*          Texture3D{ nullptr };
+};
+
+struct Decoded_D3D11_RENDER_TARGET_VIEW_DESC
+{
+    using struct_type = D3D11_RENDER_TARGET_VIEW_DESC;
+
+    D3D11_RENDER_TARGET_VIEW_DESC*   decoded_value{ nullptr };
+    Decoded_D3D11_BUFFER_RTV*        Buffer{ nullptr };
+    Decoded_D3D11_TEX1D_RTV*         Texture1D{ nullptr };
+    Decoded_D3D11_TEX1D_ARRAY_RTV*   Texture1DArray{ nullptr };
+    Decoded_D3D11_TEX2D_RTV*         Texture2D{ nullptr };
+    Decoded_D3D11_TEX2D_ARRAY_RTV*   Texture2DArray{ nullptr };
+    Decoded_D3D11_TEX2DMS_RTV*       Texture2DMS{ nullptr };
+    Decoded_D3D11_TEX2DMS_ARRAY_RTV* Texture2DMSArray{ nullptr };
+    Decoded_D3D11_TEX3D_RTV*         Texture3D{ nullptr };
+};
+
+struct Decoded_D3D11_DEPTH_STENCIL_VIEW_DESC
+{
+    using struct_type = D3D11_DEPTH_STENCIL_VIEW_DESC;
+
+    D3D11_DEPTH_STENCIL_VIEW_DESC*   decoded_value{ nullptr };
+    Decoded_D3D11_TEX1D_DSV*         Texture1D{ nullptr };
+    Decoded_D3D11_TEX1D_ARRAY_DSV*   Texture1DArray{ nullptr };
+    Decoded_D3D11_TEX2D_DSV*         Texture2D{ nullptr };
+    Decoded_D3D11_TEX2D_ARRAY_DSV*   Texture2DArray{ nullptr };
+    Decoded_D3D11_TEX2DMS_DSV*       Texture2DMS{ nullptr };
+    Decoded_D3D11_TEX2DMS_ARRAY_DSV* Texture2DMSArray{ nullptr };
+};
+
+struct Decoded_D3D11_SHADER_RESOURCE_VIEW_DESC1
+{
+    using struct_type = D3D11_SHADER_RESOURCE_VIEW_DESC1;
+
+    D3D11_SHADER_RESOURCE_VIEW_DESC1* decoded_value{ nullptr };
+    Decoded_D3D11_BUFFER_SRV*         Buffer{ nullptr };
+    Decoded_D3D11_TEX1D_SRV*          Texture1D{ nullptr };
+    Decoded_D3D11_TEX1D_ARRAY_SRV*    Texture1DArray{ nullptr };
+    Decoded_D3D11_TEX2D_SRV1*         Texture2D{ nullptr };
+    Decoded_D3D11_TEX2D_ARRAY_SRV1*   Texture2DArray{ nullptr };
+    Decoded_D3D11_TEX2DMS_SRV*        Texture2DMS{ nullptr };
+    Decoded_D3D11_TEX2DMS_ARRAY_SRV*  Texture2DMSArray{ nullptr };
+    Decoded_D3D11_TEX3D_SRV*          Texture3D{ nullptr };
+    Decoded_D3D11_TEXCUBE_SRV*        TextureCube{ nullptr };
+    Decoded_D3D11_TEXCUBE_ARRAY_SRV*  TextureCubeArray{ nullptr };
+    Decoded_D3D11_BUFFEREX_SRV*       BufferEx{ nullptr };
+};
+
+struct Decoded_D3D11_UNORDERED_ACCESS_VIEW_DESC1
+{
+    using struct_type = D3D11_UNORDERED_ACCESS_VIEW_DESC1;
+
+    D3D11_UNORDERED_ACCESS_VIEW_DESC1* decoded_value{ nullptr };
+    Decoded_D3D11_BUFFER_UAV*          Buffer{ nullptr };
+    Decoded_D3D11_TEX1D_UAV*           Texture1D{ nullptr };
+    Decoded_D3D11_TEX1D_ARRAY_UAV*     Texture1DArray{ nullptr };
+    Decoded_D3D11_TEX2D_UAV1*          Texture2D{ nullptr };
+    Decoded_D3D11_TEX2D_ARRAY_UAV1*    Texture2DArray{ nullptr };
+    Decoded_D3D11_TEX3D_UAV*           Texture3D{ nullptr };
+};
+
+struct Decoded_D3D11_RENDER_TARGET_VIEW_DESC1
+{
+    using struct_type = D3D11_RENDER_TARGET_VIEW_DESC1;
+
+    D3D11_RENDER_TARGET_VIEW_DESC1*  decoded_value{ nullptr };
+    Decoded_D3D11_BUFFER_RTV*        Buffer{ nullptr };
+    Decoded_D3D11_TEX1D_RTV*         Texture1D{ nullptr };
+    Decoded_D3D11_TEX1D_ARRAY_RTV*   Texture1DArray{ nullptr };
+    Decoded_D3D11_TEX2D_RTV1*        Texture2D{ nullptr };
+    Decoded_D3D11_TEX2D_ARRAY_RTV1*  Texture2DArray{ nullptr };
+    Decoded_D3D11_TEX2DMS_RTV*       Texture2DMS{ nullptr };
+    Decoded_D3D11_TEX2DMS_ARRAY_RTV* Texture2DMSArray{ nullptr };
+    Decoded_D3D11_TEX3D_RTV*         Texture3D{ nullptr };
+};
+
+struct Decoded_D3D11_VIDEO_COLOR
+{
+    using struct_type = D3D11_VIDEO_COLOR;
+
+    D3D11_VIDEO_COLOR* decoded_value{ nullptr };
+};
+
+struct Decoded_D3D11_AUTHENTICATED_PROTECTION_FLAGS
+{
+    using struct_type = D3D11_AUTHENTICATED_PROTECTION_FLAGS;
+
+    D3D11_AUTHENTICATED_PROTECTION_FLAGS* decoded_value{ nullptr };
+};
+
+struct Decoded_D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC
+{
+    using struct_type = D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC;
+
+    D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC* decoded_value{ nullptr };
+    Decoded_GUID*                         DecodeProfile{ nullptr };
+    Decoded_D3D11_TEX2D_VDOV*             Texture2D{ nullptr };
+};
+
+struct Decoded_D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC
+{
+    using struct_type = D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC;
+
+    D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC* decoded_value{ nullptr };
+    Decoded_D3D11_TEX2D_VPIV*              Texture2D{ nullptr };
+};
+
+struct Decoded_D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC
+{
+    using struct_type = D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC;
+
+    D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC* decoded_value{ nullptr };
+    Decoded_D3D11_TEX2D_VPOV*               Texture2D{ nullptr };
+    Decoded_D3D11_TEX2D_ARRAY_VPOV*         Texture2DArray{ nullptr };
+};
+
 GFXRECON_END_NAMESPACE(decode)
 GFXRECON_END_NAMESPACE(gfxrecon)
 

framework/decode/custom_dx12_struct_decoders_forward.h

@@ -1,5 +1,6 @@
 /*
 ** Copyright (c) 2021 LunarG, Inc.
+** Copyright (c) 2023 Qualcomm Innovation Center, 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"),
@@ -51,6 +52,21 @@ struct Decoded_D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_INPUTS;
 struct Decoded_D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA;
 struct Decoded_D3D12_RENDER_PASS_BEGINNING_ACCESS;
 struct Decoded_D3D12_RENDER_PASS_ENDING_ACCESS;
+struct Decoded_D3D11_SUBRESOURCE_DATA;
+struct Decoded_D3D11_BUFFER_SRV;
+struct Decoded_D3D11_SHADER_RESOURCE_VIEW_DESC;
+struct Decoded_D3D11_BUFFER_RTV;
+struct Decoded_D3D11_UNORDERED_ACCESS_VIEW_DESC;
+struct Decoded_D3D11_RENDER_TARGET_VIEW_DESC;
+struct Decoded_D3D11_DEPTH_STENCIL_VIEW_DESC;
+struct Decoded_D3D11_SHADER_RESOURCE_VIEW_DESC1;
+struct Decoded_D3D11_UNORDERED_ACCESS_VIEW_DESC1;
+struct Decoded_D3D11_RENDER_TARGET_VIEW_DESC1;
+struct Decoded_D3D11_VIDEO_COLOR;
+struct Decoded_D3D11_AUTHENTICATED_PROTECTION_FLAGS;
+struct Decoded_D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC;
+struct Decoded_D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC;
+struct Decoded_D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC;
 
 size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D12_CLEAR_VALUE* wrapper);
 size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D12_RESOURCE_BARRIER* wrapper);
@@ -71,6 +87,20 @@ size_t
        DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D12_VERSIONED_DEVICE_REMOVED_EXTENDED_DATA* wrapper);
 size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D12_RENDER_PASS_BEGINNING_ACCESS* wrapper);
 size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D12_RENDER_PASS_ENDING_ACCESS* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_SUBRESOURCE_DATA* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_BUFFER_SRV* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_SHADER_RESOURCE_VIEW_DESC* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_UNORDERED_ACCESS_VIEW_DESC* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_RENDER_TARGET_VIEW_DESC* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_DEPTH_STENCIL_VIEW_DESC* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_SHADER_RESOURCE_VIEW_DESC1* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_UNORDERED_ACCESS_VIEW_DESC1* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_RENDER_TARGET_VIEW_DESC1* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_VIDEO_COLOR* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_AUTHENTICATED_PROTECTION_FLAGS* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC* wrapper);
+size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC* wrapper);
 
 // Platform types.
 struct Decoded_LARGE_INTEGER;

framework/decode/decode_api_detection.cpp

@@ -1,5 +1,6 @@
 /*
 ** Copyright (c) 2022-2023 Advanced Micro Devices, Inc. All rights reserved.
+** Copyright (c) 2023 Qualcomm Innovation Center, 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"),
@@ -29,7 +30,11 @@
 GFXRECON_BEGIN_NAMESPACE(gfxrecon)
 GFXRECON_BEGIN_NAMESPACE(decode)
 
-bool DetectAPIs(const std::string& input_filename, bool& dx12_detected, bool& vulkan_detected, bool no_block_limit)
+bool DetectAPIs(const std::string& input_filename,
+                bool&              dx11_detected,
+                bool&              dx12_detected,
+                bool&              vulkan_detected,
+                bool               no_block_limit)
 {
     dx12_detected   = false;
     vulkan_detected = false;
@@ -61,6 +66,11 @@ bool DetectAPIs(const std::string& input_filename, bool& dx12_detected, bool& vu
 #endif
         file_processor.ProcessAllFrames();
 #if defined(D3D12_SUPPORT)
+        if (dx12_detection_consumer.WasD3D11APIDetected())
+        {
+            dx11_detected = true;
+        }
+
         if (dx12_detection_consumer.WasD3D12APIDetected())
         {
             dx12_detected = true;
@@ -79,7 +89,7 @@ bool DetectAPIs(const std::string& input_filename, bool& dx12_detected, bool& vu
             vulkan_detected = true;
         }
     }
-    return dx12_detected || vulkan_detected;
+    return dx11_detected || dx12_detected || vulkan_detected;
 }
 
 GFXRECON_END_NAMESPACE(decode)

framework/decode/decode_api_detection.h

@@ -1,6 +1,7 @@
 /*
 ** Copyright (c) 2022 LunarG, Inc.
 ** Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
+** Copyright (c) 2023 Qualcomm Innovation Center, 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"),
@@ -38,6 +39,7 @@ GFXRECON_BEGIN_NAMESPACE(gfxrecon)
 GFXRECON_BEGIN_NAMESPACE(decode)
 
 bool DetectAPIs(const std::string& input_filename,
+                bool&              dx11_detected,
                 bool&              dx12_detected,
                 bool&              vulkan_detected,
                 bool               no_block_limit = false);

framework/decode/decode_json_util.h

@@ -1,6 +1,7 @@
 /*
 ** Copyright (c) 2022-2023 LunarG, Inc.
 ** Copyright (c) 2023 Valve Corporation
+** Copyright (c) 2024 Qualcomm Innovation Center, 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"),
@@ -203,6 +204,30 @@ void HandleToJson(nlohmann::ordered_json&              jdata,
     }
 }
 
+template <typename THandle>
+void HandleToJson(nlohmann::ordered_json&              jdata,
+                  const HandlePointerDecoder<THandle>& data,
+                  const util::JsonOptions&             options = util::JsonOptions())
+{
+    if (data.GetPointer())
+    {
+        const auto decoded_value = data.GetPointer();
+        const auto length        = data.GetLength();
+
+        if (data.IsArray())
+        {
+            for (size_t i = 0; i < length; ++i)
+            {
+                HandleToJson(jdata[i], decoded_value[i], options);
+            }
+        }
+        else if (length == 1)
+        {
+            HandleToJson(jdata, *decoded_value, options);
+        }
+    }
+}
+
 /// @brief Thunk to HandleToJson to allow the standard FieldToJson name to be
 /// used for pointers and arrays where the type of the HandlePointerDecoder
 /// allows the correct version to be resolved.
@@ -214,6 +239,14 @@ void FieldToJson(nlohmann::ordered_json&              jdata,
     HandleToJson(jdata, data, options);
 }
 
+template <typename THandle>
+void FieldToJson(nlohmann::ordered_json&              jdata,
+                 const HandlePointerDecoder<THandle>& data,
+                 const util::JsonOptions&             options = util::JsonOptions())
+{
+    HandleToJson(jdata, data, options);
+}
+
 // Same as array FieldToJson above but converts elements pointed-to to hexadecimal
 template <typename DecodedType, typename OutputDecodedType = DecodedType>
 void FieldToJsonAsHex(nlohmann::ordered_json&                               jdata,