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

Fix GetResourceAllocationInfo2 and GetResourceAllocationInfo calls to work on non-msvc compilers with DirectX-Headers
GPUOpen-LibrariesAndSDKs · Aug 24, 2023 · 0e71874 · 0e71874
2 parents 3b949bf + 1046582
commit 0e71874
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
@@ -8187,15 +8187,25 @@ 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__
 D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfoNative(const D3D12_RESOURCE_DESC1& resourceDesc) const
 {
     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__