AuroraMiddleware/D3D12MemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git synced 2024-11-21 19:50:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator

Browse Source
This commit is contained in:
Adam Sawicki 2023-05-02 12:52:36 +02:00
commit 554cd184af
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/D3D12MemAlloc.h
View File

@ -59,9 +59,18 @@ Documentation of all members: D3D12MemAlloc.h
*/ */
// If using this library on a platform different than Windows PC or want to use different version of DXGI, // If using this library on a platform different than Windows PC or want to use different version of DXGI,
// you should include D3D12-compatible headers before this library on your own and define this macro. // you should include D3D12-compatible headers before this library on your own and define
// D3D12MA_D3D12_HEADERS_ALREADY_INCLUDED.
// Alternatively, if you are targeting the open sourced DirectX headers, defining D3D12MA_USING_DIRECTX_HEADERS
// will include them rather the ones provided by the Windows SDK.
#ifndef D3D12MA_D3D12_HEADERS_ALREADY_INCLUDED #ifndef D3D12MA_D3D12_HEADERS_ALREADY_INCLUDED
#include <d3d12.h> #if defined(D3D12MA_USING_DIRECTX_HEADERS)
#include <directx/d3d12.h>
#include <dxguids/dxguids.h>
#else
#include <d3d12.h>
#endif
#include <dxgi1_4.h> #include <dxgi1_4.h>
#endif #endif