From 0f697736abda8bfcb9ee3ab5fab9951994df9894 Mon Sep 17 00:00:00 2001 From: alexgong14 <71686001+alexgong14@users.noreply.github.com> Date: Mon, 23 Aug 2021 16:15:50 -0700 Subject: [PATCH 1/2] always include is now included even if D3DX12_NO_STATE_OBJECT_HELPERS is defined --- include/directx/d3dx12.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/directx/d3dx12.h b/include/directx/d3dx12.h index 21bb6cd..dc65337 100644 --- a/include/directx/d3dx12.h +++ b/include/directx/d3dx12.h @@ -3262,7 +3262,7 @@ inline bool operator==( const D3D12_RENDER_PASS_DEPTH_STENCIL_DESC &a, const D3D return true; } - +#include #ifndef D3DX12_NO_STATE_OBJECT_HELPERS //================================================================================================ @@ -3279,7 +3279,6 @@ inline bool operator==( const D3D12_RENDER_PASS_DEPTH_STENCIL_DESC &a, const D3D // //================================================================================================ #include -#include #include #include #ifndef D3DX12_USE_ATL From 360d4d0dc179450ac737a1a778d8033404472f97 Mon Sep 17 00:00:00 2001 From: alexgong14 Date: Tue, 24 Aug 2021 14:18:03 -0700 Subject: [PATCH 2/2] Update d3dx12.h --- include/directx/d3dx12.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/directx/d3dx12.h b/include/directx/d3dx12.h index dc65337..52ddb25 100644 --- a/include/directx/d3dx12.h +++ b/include/directx/d3dx12.h @@ -3262,7 +3262,7 @@ inline bool operator==( const D3D12_RENDER_PASS_DEPTH_STENCIL_DESC &a, const D3D return true; } -#include + #ifndef D3DX12_NO_STATE_OBJECT_HELPERS //================================================================================================ @@ -3280,6 +3280,7 @@ inline bool operator==( const D3D12_RENDER_PASS_DEPTH_STENCIL_DESC &a, const D3D //================================================================================================ #include #include +#include #include #ifndef D3DX12_USE_ATL #include @@ -4038,7 +4039,12 @@ private: #endif // #ifndef D3DX12_NO_STATE_OBJECT_HELPERS + +#ifndef D3DX12_NO_CHECK_FEATURE_SUPPORT_CLASS + //------------------------------------------------------------------------------------------------ +#include + class CD3DX12FeatureSupport { public: // Function declaration @@ -4874,6 +4880,8 @@ inline HRESULT CD3DX12FeatureSupport::QueryProtectedResourceSessionTypes(UINT No // end CD3DX12FeatureSupport +#endif // #ifndef D3DX12_NO_CHECK_FEATURE_SUPPORT_CLASS + #undef D3DX12_COM_PTR #undef D3DX12_COM_PTR_GET #undef D3DX12_COM_PTR_ADDRESSOF