Merge remote-tracking branch 'origin/master'

gscept · Nov 9, 2024 · 61b0b70 · 61b0b70
2 parents 67d0445 + 1ecb25d
commit 61b0b70
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/code/foundation/memory/rangeallocator.h b/code/foundation/memory/rangeallocator.h
@@ -360,6 +360,7 @@ RangeAllocator::InsertNode(uint size, uint offset)
     newNode.offset = offset;
     newNode.binNext = headNodeIndex;
     newNode.binPrev = RangeAllocatorNode::END;
+    newNode.resident = false;
 
     this->freeStorage += size;
 

diff --git a/code/render/coregraphics/vk/vkgraphicsdevice.cc b/code/render/coregraphics/vk/vkgraphicsdevice.cc
@@ -2240,6 +2240,7 @@ UploadInternal(const CoreGraphics::BufferId buffer, const uint offset, const voi
 void
 FreeUploads(const Util::Array<Memory::RangeAllocation>& allocations)
 {
+    Threading::CriticalScope _0(&UploadLock);
     for (const auto& alloc : allocations)
     {
         state.uploadAllocator.Dealloc(alloc);
@@ -2363,12 +2364,14 @@ NewFrame()
     {
         state.queries[state.currentBufferedFrameIndex].queryFreeCount[i] = 0;
     }
-
-    for (const auto& alloc : state.uploadAllocationsToFree[state.currentBufferedFrameIndex])
     {
-        state.uploadAllocator.Dealloc(alloc);
+        Threading::CriticalScope _0(&UploadLock);
+        for (const auto& alloc : state.uploadAllocationsToFree[state.currentBufferedFrameIndex])
+        {
+            state.uploadAllocator.Dealloc(alloc);
+        }
+        state.uploadAllocationsToFree[state.currentBufferedFrameIndex].Clear();
     }
-    state.uploadAllocationsToFree[state.currentBufferedFrameIndex].Clear();
 
     // update constant buffer offsets
     Vulkan::GraphicsDeviceState::ConstantsRingBuffer& nextCboRing = state.constantBufferRings[state.currentBufferedFrameIndex];