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

Stylistic fixes after #59

Browse Source
This commit is contained in:
Adam Sawicki 2023-08-24 14:31:50 +02:00
parent 0e71874452
commit 7491beb381
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/D3D12MemAlloc.cpp
View File

@ -8187,11 +8187,13 @@ HRESULT AllocatorPimpl::UpdateD3D12Budget()
D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfoNative(const D3D12_RESOURCE_DESC& resourceDesc) const D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfoNative(const D3D12_RESOURCE_DESC& resourceDesc) const
{ {
// This is how new D3D12 headers define GetResourceAllocationInfo function -
// different signature depending on these macros.
#if defined(_MSC_VER) || !defined(_WIN32) #if defined(_MSC_VER) || !defined(_WIN32)
return m_Device->GetResourceAllocationInfo(0, 1, &resourceDesc); return m_Device->GetResourceAllocationInfo(0, 1, &resourceDesc);
#else #else
D3D12_RESOURCE_ALLOCATION_INFO RetVal; D3D12_RESOURCE_ALLOCATION_INFO retVal;
return *m_Device->GetResourceAllocationInfo(&RetVal, 0, 1, &resourceDesc); return *m_Device->GetResourceAllocationInfo(&retVal, 0, 1, &resourceDesc);
#endif #endif
} }
@ -8200,11 +8202,14 @@ D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfoNative(c
{ {
D3D12MA_ASSERT(m_Device8 != NULL); D3D12MA_ASSERT(m_Device8 != NULL);
D3D12_RESOURCE_ALLOCATION_INFO1 info1Unused; D3D12_RESOURCE_ALLOCATION_INFO1 info1Unused;
// This is how new D3D12 headers define GetResourceAllocationInfo function -
// different signature depending on these macros.
#if defined(_MSC_VER) || !defined(_WIN32) #if defined(_MSC_VER) || !defined(_WIN32)
return m_Device8->GetResourceAllocationInfo2(0, 1, &resourceDesc, &info1Unused); return m_Device8->GetResourceAllocationInfo2(0, 1, &resourceDesc, &info1Unused);
#else #else
D3D12_RESOURCE_ALLOCATION_INFO RetVal; D3D12_RESOURCE_ALLOCATION_INFO retVal;
return *m_Device8->GetResourceAllocationInfo2(&RetVal, 0, 1, &resourceDesc, &info1Unused); return *m_Device8->GetResourceAllocationInfo2(&retVal, 0, 1, &resourceDesc, &info1Unused);
#endif #endif
} }
#endif // #ifdef __ID3D12Device8_INTERFACE_DEFINED__ #endif // #ifdef __ID3D12Device8_INTERFACE_DEFINED__