Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-09 11:40:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

D3DX12 update to fix warnings when using preview Windows SDKs

Browse Source
This commit is contained in:
Chuck Walbourn 2022-11-30 14:18:40 -08:00
parent a438adc83b
commit 42710025c3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DirectXTex/d3dx12.h
View File

@ -2611,6 +2611,9 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
return D3D12SerializeRootSignature(&pRootSignatureDesc->Desc_1_0, D3D_ROOT_SIGNATURE_VERSION_1, ppBlob, ppErrorBlob); return D3D12SerializeRootSignature(&pRootSignatureDesc->Desc_1_0, D3D_ROOT_SIGNATURE_VERSION_1, ppBlob, ppErrorBlob);
case D3D_ROOT_SIGNATURE_VERSION_1_1: case D3D_ROOT_SIGNATURE_VERSION_1_1:
#if defined(NTDDI_WIN10_CU)
case D3D_ROOT_SIGNATURE_VERSION_1_2:
#endif
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
const D3D12_ROOT_SIGNATURE_DESC1& desc_1_1 = pRootSignatureDesc->Desc_1_1; const D3D12_ROOT_SIGNATURE_DESC1& desc_1_1 = pRootSignatureDesc->Desc_1_1;
@ -2701,6 +2704,9 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
break; break;
case D3D_ROOT_SIGNATURE_VERSION_1_1: case D3D_ROOT_SIGNATURE_VERSION_1_1:
#if defined(NTDDI_WIN10_CU)
case D3D_ROOT_SIGNATURE_VERSION_1_2:
#endif
return D3D12SerializeVersionedRootSignature(pRootSignatureDesc, ppBlob, ppErrorBlob); return D3D12SerializeVersionedRootSignature(pRootSignatureDesc, ppBlob, ppErrorBlob);
} }
@ -5716,6 +5722,9 @@ inline HRESULT CD3DX12FeatureSupport::QueryHighestRootSignatureVersion()
const D3D_ROOT_SIGNATURE_VERSION allRootSignatureVersions[] = const D3D_ROOT_SIGNATURE_VERSION allRootSignatureVersions[] =
{ {
#if defined(NTDDI_WIN10_CU)
D3D_ROOT_SIGNATURE_VERSION_1_2,
#endif
D3D_ROOT_SIGNATURE_VERSION_1_1, D3D_ROOT_SIGNATURE_VERSION_1_1,
D3D_ROOT_SIGNATURE_VERSION_1_0, D3D_ROOT_SIGNATURE_VERSION_1_0,
D3D_ROOT_SIGNATURE_VERSION_1, D3D_ROOT_SIGNATURE_VERSION_1,