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

Merge pull request #59 from nathanvoglsam/fix-directx-header-support

Browse Source 
Fix GetResourceAllocationInfo2 and GetResourceAllocationInfo calls to work on non-msvc compilers with DirectX-Headers
This commit is contained in:
Adam Sawicki 2023-08-24 14:29:29 +02:00 committed by GitHub
commit 0e71874452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/D3D12MemAlloc.cpp
View File

@ -8187,7 +8187,12 @@ HRESULT AllocatorPimpl::UpdateD3D12Budget()
D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfoNative(const D3D12_RESOURCE_DESC& resourceDesc) const
{
#if defined(_MSC_VER) || !defined(_WIN32)
return m_Device->GetResourceAllocationInfo(0, 1, &resourceDesc);
#else
D3D12_RESOURCE_ALLOCATION_INFO RetVal;
return *m_Device->GetResourceAllocationInfo(&RetVal, 0, 1, &resourceDesc);
#endif
}
#ifdef __ID3D12Device8_INTERFACE_DEFINED__
@ -8195,7 +8200,12 @@ D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfoNative(c
{
D3D12MA_ASSERT(m_Device8 != NULL);
D3D12_RESOURCE_ALLOCATION_INFO1 info1Unused;
#if defined(_MSC_VER) || !defined(_WIN32)
return m_Device8->GetResourceAllocationInfo2(0, 1, &resourceDesc, &info1Unused);
#else
D3D12_RESOURCE_ALLOCATION_INFO RetVal;
return *m_Device8->GetResourceAllocationInfo2(&RetVal, 0, 1, &resourceDesc, &info1Unused);
#endif
}
#endif // #ifdef __ID3D12Device8_INTERFACE_DEFINED__