Not even with long texts and small scales

src/Engine/Graphics/Vulkan/VulkanAllocator.cpp

@@ -90,16 +90,18 @@ PSubAllocation Allocation::getSuballocation(VkDeviceSize requestedSize, VkDevice
             return nullptr;
         }
     }
-    for (auto& [allocatedOffset, freeAllocation] : freeRanges)
+    for (auto& it : freeRanges)
     {
+        VkDeviceSize allocatedOffset = it.first;
+        PSubAllocation freeAllocation = it.second;
         assert(allocatedOffset == freeAllocation->allocatedOffset);
         VkDeviceSize alignedOffset = align(allocatedOffset, alignment);
         VkDeviceSize alignmentAdjustment = alignedOffset - allocatedOffset;
         VkDeviceSize size = alignmentAdjustment + requestedSize;
         if (freeAllocation->size == size)
         {
-            freeRanges.erase(allocatedOffset);
             activeAllocations[allocatedOffset] = freeAllocation.getHandle();
+            freeRanges.erase(allocatedOffset);
             bytesUsed += size;
             return freeAllocation;
         }
@@ -184,7 +186,10 @@ void Allocation::markFree(SubAllocation *allocation)
         activeAllocations.erase(allocation->allocatedOffset);
     }
     bytesUsed -= allocation->allocatedSize;
-    // TODO: delete allocation when bytesUsed == 0
+    if(bytesUsed == 0)
+    {
+        allocator->free(this);
+    }
 }
 
 Allocator::Allocator(PGraphics graphics)
@@ -230,6 +235,7 @@ PSubAllocation Allocator::allocate(const VkMemoryRequirements2 &memRequirements2
         {
             PAllocation newAllocation = new Allocation(graphics, this, requirements.size, memoryTypeIndex, properties, dedicatedInfo);
             heaps[heapIndex].allocations.add(newAllocation);
+            heaps[heapIndex].inUse += newAllocation->bytesAllocated;
             return newAllocation->getSuballocation(requirements.size, requirements.alignment);
         } 
     }
@@ -245,6 +251,7 @@ PSubAllocation Allocator::allocate(const VkMemoryRequirements2 &memRequirements2
     // no suitable allocations found, allocate new block
     PAllocation newAllocation = new Allocation(graphics, this, (requirements.size > MemoryBlockSize) ? requirements.size : (VkDeviceSize)MemoryBlockSize, memoryTypeIndex, properties, nullptr);
     heaps[heapIndex].allocations.add(newAllocation);
+    heaps[heapIndex].inUse += newAllocation->bytesAllocated;
     return newAllocation->getSuballocation(requirements.size, requirements.alignment);
 }
 
@@ -257,13 +264,13 @@ void Allocator::free(Allocation *allocation)
         {
             if (heap.allocations[i] == allocation)
             {
+                heap.inUse -= allocation->bytesAllocated;
                 heap.allocations.removeAt(i, false);
                 return;
             }
         }
     }
 }
-
 VkResult Allocator::findMemoryType(uint32 typeBits, VkMemoryPropertyFlags properties, uint8 *typeIndex)
 {
     for (uint8 memoryIndex = 0; memoryIndex < memProperties.memoryTypeCount && typeBits; ++memoryIndex)

src/Engine/Graphics/Vulkan/VulkanAllocator.h

@@ -142,7 +142,7 @@ public:
 	}
 
 	void free(Allocation *allocation);
-
+	void notifyUsageChanged(int64 usageChange);
 private:
 	enum
 	{
@@ -151,6 +151,7 @@ private:
 	struct HeapInfo
 	{
 		VkDeviceSize maxSize = 0;
+		VkDeviceSize inUse = 0;
 		Array<PAllocation> allocations;
 	};
 	Array<HeapInfo> heaps;

src/Engine/Graphics/Vulkan/VulkanBuffer.cpp

@@ -14,7 +14,7 @@ struct PendingBuffer
     bool bWriteOnly;
 };
 
-static Map<ShaderBuffer *, PendingBuffer> pendingBuffers;
+static std::map<ShaderBuffer *, PendingBuffer> pendingBuffers;
 
 ShaderBuffer::ShaderBuffer(PGraphics graphics, uint32 size, VkBufferUsageFlags usage, Gfx::QueueType& queueType, bool bDynamic)
     : graphics(graphics)
@@ -54,8 +54,7 @@ ShaderBuffer::ShaderBuffer(PGraphics graphics, uint32 size, VkBufferUsageFlags u
         VK_CHECK(vkCreateBuffer(graphics->getDevice(), &info, nullptr, &buffers[i].buffer));
         bufferReqInfo.buffer = buffers[i].buffer;
         vkGetBufferMemoryRequirements2(graphics->getDevice(), &bufferReqInfo, &memRequirements);
-        auto temp = graphics->getAllocator()->allocate(memRequirements, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, buffers[i].buffer);
-        buffers[i].allocation = temp;
+        buffers[i].allocation = graphics->getAllocator()->allocate(memRequirements, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, buffers[i].buffer);
         vkBindBufferMemory(graphics->getDevice(), buffers[i].buffer, buffers[i].allocation->getHandle(), buffers[i].allocation->getOffset());
     }
 }
@@ -245,7 +244,7 @@ void ShaderBuffer::unlock()
     auto found = pendingBuffers.find(this);
     if (found != pendingBuffers.end())
     {
-        PendingBuffer pending = found->value;
+        PendingBuffer pending = found->second;
         pending.stagingBuffer->flushMappedMemory();
         pendingBuffers.erase(this);
         if (pending.bWriteOnly)

src/Engine/Graphics/Vulkan/VulkanViewport.cpp

@@ -229,10 +229,6 @@ void Window::present()
     while (presentResult != VK_SUCCESS)
     {
         presentResult = vkQueuePresentKHR(graphics->getGraphicsCommands()->getQueue()->getHandle(), &info);
-        if(presentResult == VK_ERROR_OUT_OF_DATE_KHR)
-        {
-            recreateSwapchain(windowState);
-        }
     }
     Gfx::currentFrameIndex = (Gfx::currentFrameIndex + 1)%Gfx::numFramesBuffered;
     static double lastFrameTime = 0.f;