AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-11-09 22:40:06 +00:00
Code Issues Releases Wiki Activity

Another D3DX12 update to fix errors when using preview Windows SDKs (#370)

Browse Source
This commit is contained in:
Chuck Walbourn 2023-07-03 15:29:35 -07:00 committed by GitHub
parent 40dacea267
commit 70909fd6be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DirectXTex/d3dx12.h
View File

@ -707,7 +707,7 @@ struct CD3DX12_RASTERIZER_DESC2 : public D3D12_RASTERIZER_DESC2
} }
operator D3D12_RASTERIZER_DESC() const noexcept operator D3D12_RASTERIZER_DESC() const noexcept
{ {
return (D3D12_RASTERIZER_DESC)CD3DX12_RASTERIZER_DESC1((D3D12_RASTERIZER_DESC1)*this); return static_cast<D3D12_RASTERIZER_DESC>(CD3DX12_RASTERIZER_DESC1(static_cast<D3D12_RASTERIZER_DESC1>(*this)));
} }
}; };
#endif // D3D12_SDK_VERSION >= 610 #endif // D3D12_SDK_VERSION >= 610
@ -5580,7 +5580,9 @@ public: // Function declaration
#endif #endif
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609) #if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609)
#if 0
BOOL GPUUploadHeapSupported() const noexcept; BOOL GPUUploadHeapSupported() const noexcept;
#endif
// D3D12_OPTIONS17 // D3D12_OPTIONS17
BOOL NonNormalizedCoordinateSamplersSupported() const noexcept; BOOL NonNormalizedCoordinateSamplersSupported() const noexcept;
@ -6279,7 +6281,9 @@ FEATURE_SUPPORT_GET(BOOL, m_dOptions15, DynamicIndexBufferStripCutSupported);
FEATURE_SUPPORT_GET(BOOL, m_dOptions16, DynamicDepthBiasSupported); FEATURE_SUPPORT_GET(BOOL, m_dOptions16, DynamicDepthBiasSupported);
#endif #endif
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609) #if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609)
#if 0
FEATURE_SUPPORT_GET(BOOL, m_dOptions16, GPUUploadHeapSupported); FEATURE_SUPPORT_GET(BOOL, m_dOptions16, GPUUploadHeapSupported);
#endif
// 46: Options17 // 46: Options17
FEATURE_SUPPORT_GET(BOOL, m_dOptions17, NonNormalizedCoordinateSamplersSupported); FEATURE_SUPPORT_GET(BOOL, m_dOptions17, NonNormalizedCoordinateSamplersSupported);