mirrors/DirectX-Headers
1
0
Fork 0
mirror of https://github.com/microsoft/DirectX-Headers.git synced 2024-11-27 03:43:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #28 from alexgong14/alexgong14-patch-1

Browse Source 
CheckFeatureSupport class now includes vector when D3DX12_NO_STATE_OBJECT_HELPERS is defined
This commit is contained in:
Jesse Natalie 2021-08-24 15:06:36 -07:00 committed by GitHub
commit 3f1ca73044
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/directx/d3dx12.h
View File

@ -3279,8 +3279,8 @@ inline bool operator==( const D3D12_RENDER_PASS_DEPTH_STENCIL_DESC &a, const D3D
//
//================================================================================================
#include <list>
#include <vector>
#include <string>
#include <vector>
#include <memory>
#ifndef D3DX12_USE_ATL
#include <wrl/client.h>
@ -4039,7 +4039,12 @@ private:
#endif // #ifndef D3DX12_NO_STATE_OBJECT_HELPERS
#ifndef D3DX12_NO_CHECK_FEATURE_SUPPORT_CLASS
//------------------------------------------------------------------------------------------------
#include <vector>
class CD3DX12FeatureSupport
{
public: // Function declaration
@ -4875,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