Fixing logic on readback pool: growing was not growing with the corre…

…ct next size
kecho · Nov 26, 2023 · a95f824 · a95f824
1 parent 4914040
commit a95f824
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Source/modules/render/dx12/Dx12BufferPool.cpp b/Source/modules/render/dx12/Dx12BufferPool.cpp
@@ -19,7 +19,7 @@ Dx12BufferPool::Dx12BufferPool(Dx12Device& device, bool isReadback)
 {
     bool success = createNewHeap(InitialBufferPoolSize);
     CPY_ASSERT_MSG(success, "Could not allocate heap.");
-    m_nextHeapSize = 2 * InitialBufferPoolSize;
+    m_nextHeapSize = InitialBufferPoolSize;
 }
 
 bool Dx12BufferPool::createNewHeap(size_t size)
@@ -79,10 +79,9 @@ Dx12CpuMemBlock Dx12BufferPool::allocate(size_t size)
     if (selectedHeapIndex == -1)
     {
         selectedHeapIndex = m_heaps.size();
+        m_nextHeapSize = (2 * m_nextHeapSize) > size ? (2 * m_nextHeapSize) : size;
         if (!createNewHeap(m_nextHeapSize))
             return Dx12CpuMemBlock();
-
-        m_nextHeapSize = (2 * m_nextHeapSize) > size ? (2 * m_nextHeapSize) : size;
     }
 
     HeapState& selectedHeap = m_heaps[selectedHeapIndex];

diff --git a/Source/modules/render/vulkan/VulkanReadbackBufferPool.cpp b/Source/modules/render/vulkan/VulkanReadbackBufferPool.cpp
@@ -18,7 +18,7 @@ VulkanReadbackBufferPool::VulkanReadbackBufferPool(VulkanDevice& device)
 {
     bool success = createNewHeap(InitialBufferPoolSize);
     CPY_ASSERT_MSG(success, "Could not allocate heap.");
-    m_nextHeapSize = 2 * InitialBufferPoolSize;
+    m_nextHeapSize = InitialBufferPoolSize;
 }
 
 VulkanReadbackBufferPool::~VulkanReadbackBufferPool()
@@ -79,10 +79,9 @@ VulkanReadbackMemBlock VulkanReadbackBufferPool::allocate(size_t size)
     if (selectedHeapIndex == -1)
     {
         selectedHeapIndex = m_heaps.size();
+        m_nextHeapSize = (2 * m_nextHeapSize) > size ? (2 * m_nextHeapSize) : size;
         if (!createNewHeap(m_nextHeapSize))
             return VulkanReadbackMemBlock();
-
-        m_nextHeapSize = (2 * m_nextHeapSize) > size ? (2 * m_nextHeapSize) : size;
     }
 
     HeapState& selectedHeap = m_heaps[selectedHeapIndex];