Add missing Desc2 union member to decoded D3D12_VERSIONED_ROOT_SIGNAT… (

#1552) * Add missing Desc2 union member to decoded D3D12_VERSIONED_ROOT_SIGNATURE_DESC * Regenerate DX12 files * Fix SDK numbers
LunarG · May 20, 2024 · cc72833 · cc72833
1 parent b31b95d
commit cc72833
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/framework/decode/custom_dx12_struct_decoders.cpp b/framework/decode/custom_dx12_struct_decoders.cpp
@@ -461,6 +461,11 @@ size_t DecodeStruct(const uint8_t* buffer, size_t buffer_size, Decoded_D3D12_VER
             wrapper->Desc_1_1->decoded_value = &(value->Desc_1_1);
             bytes_read += DecodeStruct((buffer + bytes_read), (buffer_size - bytes_read), wrapper->Desc_1_1);
             break;
+        case D3D_ROOT_SIGNATURE_VERSION_1_2:
+            wrapper->Desc_1_2                = DecodeAllocator::Allocate<Decoded_D3D12_ROOT_SIGNATURE_DESC2>();
+            wrapper->Desc_1_2->decoded_value = &(value->Desc_1_2);
+            bytes_read += DecodeStruct((buffer + bytes_read), (buffer_size - bytes_read), wrapper->Desc_1_2);
+            break;
     }
 
     return bytes_read;

diff --git a/framework/decode/custom_dx12_struct_decoders.h b/framework/decode/custom_dx12_struct_decoders.h
@@ -151,6 +151,7 @@ struct Decoded_D3D12_VERSIONED_ROOT_SIGNATURE_DESC
     D3D12_VERSIONED_ROOT_SIGNATURE_DESC* decoded_value{ nullptr };
     Decoded_D3D12_ROOT_SIGNATURE_DESC*   Desc_1_0{ nullptr };
     Decoded_D3D12_ROOT_SIGNATURE_DESC1*  Desc_1_1{ nullptr };
+    Decoded_D3D12_ROOT_SIGNATURE_DESC2*  Desc_1_2{ nullptr };
 };
 
 struct Decoded_D3D12_INDIRECT_ARGUMENT_DESC

diff --git a/framework/decode/dx12_resource_value_mapper.cpp b/framework/decode/dx12_resource_value_mapper.cpp
@@ -562,6 +562,10 @@ void Dx12ResourceValueMapper::PostProcessCreateRootSignature(PointerDecoder<uint
                 GetRootSignatureResourceValueInfos(&versioned_root_sig->Desc_1_1,
                                                    root_sig_extra_info->resource_value_infos);
                 break;
+            case D3D_ROOT_SIGNATURE_VERSION_1_2:
+                GetRootSignatureResourceValueInfos(&versioned_root_sig->Desc_1_2,
+                                                   root_sig_extra_info->resource_value_infos);
+                break;
             default:
                 GFXRECON_LOG_ERROR("Ignoring unrecognized root signature version (%d) for root signature (id=%" PRIu64
                                    ").",

diff --git a/framework/encode/custom_dx12_struct_encoders.cpp b/framework/encode/custom_dx12_struct_encoders.cpp
@@ -309,6 +309,9 @@ void EncodeStruct(ParameterEncoder* encoder, const D3D12_VERSIONED_ROOT_SIGNATUR
         case D3D_ROOT_SIGNATURE_VERSION_1_1:
             EncodeStruct(encoder, value.Desc_1_1);
             break;
+        case D3D_ROOT_SIGNATURE_VERSION_1_2:
+            EncodeStruct(encoder, value.Desc_1_2);
+            break;
         default:
             break;
     }

diff --git a/framework/generated/dx12_generators/dx12_struct_decoders_to_json_body_generator.py b/framework/generated/dx12_generators/dx12_struct_decoders_to_json_body_generator.py
@@ -502,7 +502,7 @@ def makeUnionFieldToJson(self, properties, struct_name, union_index):
                     }
                     case D3D_ROOT_SIGNATURE_VERSION_1_2:
                     {
-                        /// @todo Uncomment this once the union member is added to the decoded struct: FieldToJson(jdata["Desc_1_2"], meta_struct.Desc_1_2, options);
+                        FieldToJson(jdata["Desc_1_2"], meta_struct.Desc_1_2, options);
                         GFXRECON_LOG_ERROR("Unknown D3D_ROOT_SIGNATURE_VERSION_1_2 in D3D12_VERSIONED_ROOT_SIGNATURE_DESC.");
                         break;
                     }

diff --git a/framework/generated/generated_dx12_struct_decoders_to_json.cpp b/framework/generated/generated_dx12_struct_decoders_to_json.cpp
@@ -2944,7 +2944,7 @@ void FieldToJson(nlohmann::ordered_json& jdata, const Decoded_D3D12_VERSIONED_RO
             }
             case D3D_ROOT_SIGNATURE_VERSION_1_2:
             {
-                /// @todo Uncomment this once the union member is added to the decoded struct: FieldToJson(jdata["Desc_1_2"], meta_struct.Desc_1_2, options);
+                FieldToJson(jdata["Desc_1_2"], meta_struct.Desc_1_2, options);
                 GFXRECON_LOG_ERROR("Unknown D3D_ROOT_SIGNATURE_VERSION_1_2 in D3D12_VERSIONED_ROOT_SIGNATURE_DESC.");
                 break;
             }