forked from hertog/godot-module-template
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
diff --git a/thirdparty/d3d12ma/D3D12MemAlloc.cpp b/thirdparty/d3d12ma/D3D12MemAlloc.cpp
|
|
index 8e2488091a..80d910e694 100644
|
|
--- a/thirdparty/d3d12ma/D3D12MemAlloc.cpp
|
|
+++ b/thirdparty/d3d12ma/D3D12MemAlloc.cpp
|
|
@@ -33,6 +33,12 @@
|
|
#include <shared_mutex>
|
|
#endif
|
|
|
|
+#if !defined(_MSC_VER)
|
|
+#include <guiddef.h>
|
|
+
|
|
+#include <dxguids.h>
|
|
+#endif
|
|
+
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
@@ -8178,7 +8184,13 @@ 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 ret;
|
|
+ m_Device->GetResourceAllocationInfo(&ret, 0, 1, &resourceDesc);
|
|
+ return ret;
|
|
+#endif
|
|
}
|
|
|
|
#ifdef __ID3D12Device8_INTERFACE_DEFINED__
|
|
@@ -8186,7 +8198,13 @@ 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 ret;
|
|
+ m_Device8->GetResourceAllocationInfo2(&ret, 0, 1, &resourceDesc, &info1Unused);
|
|
+ return ret;
|
|
+#endif
|
|
}
|
|
#endif // #ifdef __ID3D12Device8_INTERFACE_DEFINED__
|
|
|