You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-04 12:00:25 +00:00
Add Persistent Buffers
This work is a heavily refactored and rewritten from TheForge's initial code. TheForge's original code had too many race conditions and was fundamentally flawed as it was too easy to incur into those data races by accident. However they identified the proper places that needed changes, and the idea was sound. I used their work as a blueprint to design this work. This PR implements: - Introduction of UMA buffers used by a few buffers (most notably the ones filled by _fill_instance_data). Ironically this change seems to positively affect PC more than it does on Mobile. Updates D3D12 Memory Allocator to get GPU_UPLOAD heap support. Metal implementation by Stuart Carnie. Co-authored-by: Stuart Carnie <stuart.carnie@gmail.com> Co-authored-by: TheForge team
This commit is contained in:
976
thirdparty/d3d12ma/D3D12MemAlloc.cpp
vendored
976
thirdparty/d3d12ma/D3D12MemAlloc.cpp
vendored
File diff suppressed because it is too large
Load Diff
912
thirdparty/d3d12ma/D3D12MemAlloc.h
vendored
912
thirdparty/d3d12ma/D3D12MemAlloc.h
vendored
File diff suppressed because it is too large
Load Diff
2
thirdparty/d3d12ma/LICENSE.txt
vendored
2
thirdparty/d3d12ma/LICENSE.txt
vendored
@@ -1,4 +1,4 @@
|
||||
Copyright (c) 2019-2022 Advanced Micro Devices, Inc. All rights reserved.
|
||||
Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
8
thirdparty/d3d12ma/README.md
vendored
Normal file
8
thirdparty/d3d12ma/README.md
vendored
Normal file
@@ -0,0 +1,8 @@
|
||||
Upstream:
|
||||
https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator
|
||||
|
||||
commit d26c54a6f40c66611dd33c77df4198784b53a8e2
|
||||
Author: Adam Sawicki <adam.sawicki@amd.com>
|
||||
Date: Wed Apr 9 15:07:43 2025 +0200
|
||||
|
||||
Minor fixes after #71
|
||||
@@ -1,45 +0,0 @@
|
||||
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__
|
||||
|
||||
Reference in New Issue
Block a user