| 
									
										
										
										
											2024-02-18 00:44:06 +02:00
										 |  |  | diff --git a/thirdparty/directx_headers/include/directx/d3dx12_root_signature.h b/thirdparty/directx_headers/include/directx/d3dx12_root_signature.h
 | 
					
						
							| 
									
										
										
										
											2025-01-31 10:58:38 +01:00
										 |  |  | index 572efed852..2da79d10f1 100644
 | 
					
						
							| 
									
										
										
										
											2024-02-18 00:44:06 +02:00
										 |  |  | --- a/thirdparty/directx_headers/include/directx/d3dx12_root_signature.h
 | 
					
						
							|  |  |  | +++ b/thirdparty/directx_headers/include/directx/d3dx12_root_signature.h
 | 
					
						
							| 
									
										
										
										
											2025-01-31 10:58:38 +01:00
										 |  |  | @@ -996,6 +996,7 @@ struct CD3DX12_GPU_DESCRIPTOR_HANDLE : public D3D12_GPU_DESCRIPTOR_HANDLE
 | 
					
						
							| 
									
										
										
										
											2024-02-18 00:44:06 +02:00
										 |  |  |  // two code paths for building root signatures, this helper method reconstructs a 1.0 signature when | 
					
						
							|  |  |  |  // 1.1 is not supported. | 
					
						
							|  |  |  |  inline HRESULT D3DX12SerializeVersionedRootSignature( | 
					
						
							|  |  |  | +    _In_ HMODULE pLibD3D12,
 | 
					
						
							|  |  |  |      _In_ const D3D12_VERSIONED_ROOT_SIGNATURE_DESC* pRootSignatureDesc, | 
					
						
							|  |  |  |      D3D_ROOT_SIGNATURE_VERSION MaxVersion, | 
					
						
							|  |  |  |      _Outptr_ ID3DBlob** ppBlob, | 
					
						
							| 
									
										
										
										
											2025-01-31 10:58:38 +01:00
										 |  |  | @@ -1006,13 +1007,18 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
 | 
					
						
							| 
									
										
										
										
											2024-02-18 00:44:06 +02:00
										 |  |  |          *ppErrorBlob = nullptr; | 
					
						
							|  |  |  |      } | 
					
						
							|  |  |  |   | 
					
						
							| 
									
										
										
										
											2025-01-31 10:58:38 +01:00
										 |  |  | +    PFN_D3D12_SERIALIZE_ROOT_SIGNATURE d3d_D3D12SerializeRootSignature = (PFN_D3D12_SERIALIZE_ROOT_SIGNATURE)(void *)GetProcAddress(pLibD3D12, "D3D12SerializeRootSignature");
 | 
					
						
							| 
									
										
										
										
											2024-02-18 00:44:06 +02:00
										 |  |  | +    if (d3d_D3D12SerializeRootSignature == nullptr) {
 | 
					
						
							|  |  |  | +        return E_INVALIDARG;
 | 
					
						
							|  |  |  | +    }
 | 
					
						
							|  |  |  | +    PFN_D3D12_SERIALIZE_VERSIONED_ROOT_SIGNATURE d3d_D3D12SerializeVersionedRootSignature = (PFN_D3D12_SERIALIZE_VERSIONED_ROOT_SIGNATURE)(void *)GetProcAddress(pLibD3D12, "D3D12SerializeVersionedRootSignature");
 | 
					
						
							|  |  |  |      switch (MaxVersion) | 
					
						
							|  |  |  |      { | 
					
						
							|  |  |  |          case D3D_ROOT_SIGNATURE_VERSION_1_0: | 
					
						
							|  |  |  |              switch (pRootSignatureDesc->Version) | 
					
						
							|  |  |  |              { | 
					
						
							|  |  |  |                  case D3D_ROOT_SIGNATURE_VERSION_1_0: | 
					
						
							|  |  |  | -                    return D3D12SerializeRootSignature(&pRootSignatureDesc->Desc_1_0, D3D_ROOT_SIGNATURE_VERSION_1, ppBlob, ppErrorBlob);
 | 
					
						
							|  |  |  | +                    return d3d_D3D12SerializeRootSignature(&pRootSignatureDesc->Desc_1_0, D3D_ROOT_SIGNATURE_VERSION_1, ppBlob, ppErrorBlob);
 | 
					
						
							|  |  |  |   | 
					
						
							|  |  |  |                  case D3D_ROOT_SIGNATURE_VERSION_1_1: | 
					
						
							|  |  |  |  #if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609) | 
					
						
							| 
									
										
										
										
											2025-01-31 10:58:38 +01:00
										 |  |  | @@ -1114,7 +1120,7 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
 | 
					
						
							| 
									
										
										
										
											2024-02-18 00:44:06 +02:00
										 |  |  |                      if (SUCCEEDED(hr)) | 
					
						
							|  |  |  |                      { | 
					
						
							|  |  |  |                          const CD3DX12_ROOT_SIGNATURE_DESC desc_1_0(desc_1_1.NumParameters, pParameters_1_0, desc_1_1.NumStaticSamplers, pStaticSamplers == nullptr ? desc_1_1.pStaticSamplers : pStaticSamplers, desc_1_1.Flags); | 
					
						
							|  |  |  | -                        hr = D3D12SerializeRootSignature(&desc_1_0, D3D_ROOT_SIGNATURE_VERSION_1, ppBlob, ppErrorBlob);
 | 
					
						
							|  |  |  | +                        hr = d3d_D3D12SerializeRootSignature(&desc_1_0, D3D_ROOT_SIGNATURE_VERSION_1, ppBlob, ppErrorBlob);
 | 
					
						
							|  |  |  |                      } | 
					
						
							|  |  |  |   | 
					
						
							|  |  |  |                      if (pParameters) | 
					
						
							| 
									
										
										
										
											2025-01-31 10:58:38 +01:00
										 |  |  | @@ -1145,7 +1151,7 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
 | 
					
						
							| 
									
										
										
										
											2024-02-18 00:44:06 +02:00
										 |  |  |              { | 
					
						
							|  |  |  |              case D3D_ROOT_SIGNATURE_VERSION_1_0: | 
					
						
							|  |  |  |              case D3D_ROOT_SIGNATURE_VERSION_1_1: | 
					
						
							|  |  |  | -                return D3D12SerializeVersionedRootSignature(pRootSignatureDesc, ppBlob, ppErrorBlob);
 | 
					
						
							|  |  |  | +                return d3d_D3D12SerializeVersionedRootSignature(pRootSignatureDesc, ppBlob, ppErrorBlob);
 | 
					
						
							|  |  |  |   | 
					
						
							|  |  |  |  #if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609) | 
					
						
							|  |  |  |              case D3D_ROOT_SIGNATURE_VERSION_1_2: | 
					
						
							| 
									
										
										
										
											2025-01-31 10:58:38 +01:00
										 |  |  | @@ -1181,7 +1187,7 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
 | 
					
						
							| 
									
										
										
										
											2024-02-18 00:44:06 +02:00
										 |  |  |                  if (SUCCEEDED(hr)) | 
					
						
							|  |  |  |                  { | 
					
						
							|  |  |  |                      const CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC desc(desc_1_1.NumParameters, desc_1_1.pParameters, desc_1_1.NumStaticSamplers, pStaticSamplers == nullptr ? desc_1_1.pStaticSamplers : pStaticSamplers, desc_1_1.Flags); | 
					
						
							|  |  |  | -                    hr = D3D12SerializeVersionedRootSignature(&desc, ppBlob, ppErrorBlob);
 | 
					
						
							|  |  |  | +                    hr = d3d_D3D12SerializeVersionedRootSignature(&desc, ppBlob, ppErrorBlob);
 | 
					
						
							|  |  |  |                  } | 
					
						
							|  |  |  |   | 
					
						
							|  |  |  |                  if (pStaticSamplers) | 
					
						
							| 
									
										
										
										
											2025-01-31 10:58:38 +01:00
										 |  |  | @@ -1197,7 +1203,7 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
 | 
					
						
							| 
									
										
										
										
											2024-02-18 00:44:06 +02:00
										 |  |  |  #if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609) | 
					
						
							|  |  |  |          case D3D_ROOT_SIGNATURE_VERSION_1_2: | 
					
						
							|  |  |  |  #endif | 
					
						
							|  |  |  | -            return D3D12SerializeVersionedRootSignature(pRootSignatureDesc, ppBlob, ppErrorBlob);
 | 
					
						
							|  |  |  | +            return d3d_D3D12SerializeVersionedRootSignature(pRootSignatureDesc, ppBlob, ppErrorBlob);
 | 
					
						
							|  |  |  |      } | 
					
						
							|  |  |  |   | 
					
						
							|  |  |  |      return E_INVALIDARG; |