seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Thirdparty: Harmonize patches to document downstream changes

Browse Source
This commit is contained in:
Rémi Verschelde
2025-01-31 10:58:38 +01:00
parent 0d14ae58b0
commit 91907a89f7
141 changed files with 1274 additions and 3849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
thirdparty/vulkan/patches/VKEnumStringHelper-use-godot-vulkan.patch → thirdparty/vulkan/patches/0001-VKEnumStringHelper-godot-vulkan.patch vendored
View File

0
thirdparty/vulkan/patches/VMA-use-godot-vulkan.patch → thirdparty/vulkan/patches/0002-VMA-godot-vulkan.patch vendored
View File

10
thirdparty/vulkan/patches/0003-VMA-add-vmaCalculateLazilyAllocatedBytes.patch vendored
View File

@ -1,12 +1,11 @@
diff --git a/thirdparty/vulkan/vk_mem_alloc.h b/thirdparty/vulkan/vk_mem_alloc.h
index ecb84094b9..50ff4ea1c2 100644
index ecb84094b9..c436209896 100644
--- a/thirdparty/vulkan/vk_mem_alloc.h
+++ b/thirdparty/vulkan/vk_mem_alloc.h
@@ -1713,6 +1713,21 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(
@@ -1713,6 +1713,19 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(
VmaAllocator VMA_NOT_NULL allocator,
VmaTotalStatistics* VMA_NOT_NULL pStats);
+// -- GODOT begin --
+/** \brief Retrieves lazily allocated bytes
+
+This function is called "calculate" not "get" because it has to traverse all
@ -19,16 +18,14 @@ index ecb84094b9..50ff4ea1c2 100644
+*/
+VMA_CALL_PRE uint64_t VMA_CALL_POST vmaCalculateLazilyAllocatedBytes(
+ VmaAllocator VMA_NOT_NULL allocator);
+// -- GODOT end --
+
/** \brief Retrieves information about current memory usage and budget for all memory heaps.
\param allocator
@@ -14912,6 +14927,28 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(
@@ -14912,6 +14925,26 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(
allocator->CalculateStatistics(pStats);
}
+// -- GODOT begin --
+VMA_CALL_PRE uint64_t VMA_CALL_POST vmaCalculateLazilyAllocatedBytes(
+ VmaAllocator allocator)
+{
@ -48,7 +45,6 @@ index ecb84094b9..50ff4ea1c2 100644
+ }
+ return total_lazilily_allocated_bytes;
+}
+// -- GODOT end --
+
VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets(
VmaAllocator allocator,

4
thirdparty/vulkan/vk_mem_alloc.h vendored
View File

@ -1713,7 +1713,6 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(
VmaAllocator VMA_NOT_NULL allocator,
VmaTotalStatistics* VMA_NOT_NULL pStats);
// -- GODOT begin --
/** \brief Retrieves lazily allocated bytes
This function is called "calculate" not "get" because it has to traverse all
@ -1726,7 +1725,6 @@ become outdated.
*/
VMA_CALL_PRE uint64_t VMA_CALL_POST vmaCalculateLazilyAllocatedBytes(
VmaAllocator VMA_NOT_NULL allocator);
// -- GODOT end --
/** \brief Retrieves information about current memory usage and budget for all memory heaps.
@ -14927,7 +14925,6 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(
allocator->CalculateStatistics(pStats);
}
// -- GODOT begin --
VMA_CALL_PRE uint64_t VMA_CALL_POST vmaCalculateLazilyAllocatedBytes(
VmaAllocator allocator)
{
@ -14947,7 +14944,6 @@ VMA_CALL_PRE uint64_t VMA_CALL_POST vmaCalculateLazilyAllocatedBytes(
}
return total_lazilily_allocated_bytes;
}
// -- GODOT end --
VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets(
VmaAllocator allocator,