From 4795cdfc7936ac89da46f4d6f9de33fd481933a4 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 8 Mar 2022 15:58:57 +0200
Subject: [PATCH] Minor tweaks to MemoryAllocator

---
 source/backends/vulkan/memoryallocator.cpp | 6 +++---
 source/backends/vulkan/memoryallocator.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/backends/vulkan/memoryallocator.cpp b/source/backends/vulkan/memoryallocator.cpp
index 4b3595b6..82155faf 100644
--- a/source/backends/vulkan/memoryallocator.cpp
+++ b/source/backends/vulkan/memoryallocator.cpp
@@ -56,7 +56,7 @@ MemoryAllocator::~MemoryAllocator()
 			vk.FreeMemory(r.memory);
 }
 
-unsigned MemoryAllocator::find_memory_pool(unsigned mask, MemoryType type)
+unsigned MemoryAllocator::find_memory_pool(unsigned mask, MemoryType type) const
 {
 	for(unsigned i=0; i<pools.size(); ++i)
 		if((mask&(1<<i)) && pools[i].type==type)
@@ -86,7 +86,7 @@ unsigned MemoryAllocator::create_region(unsigned pool_index, size_t size, bool d
 	return regions.size()-1;
 }
 
-vector<unsigned>::iterator MemoryAllocator::lower_bound_by_size(vector<unsigned> &indices, size_t size)
+vector<unsigned>::iterator MemoryAllocator::lower_bound_by_size(vector<unsigned> &indices, size_t size) const
 {
 	return lower_bound(indices, size, [this](unsigned j, unsigned s){ return blocks[j].size<s; });
 }
@@ -131,7 +131,7 @@ unsigned MemoryAllocator::allocate(size_t size, size_t align, unsigned type_bits
 	{
 		Block block;
 		block.region = create_region(pool_index, default_region_size, false);
-		block.size = default_region_size;
+		block.size = regions[block.region].size;
 
 		blocks.push_back(block);
 		block_index = blocks.size()-1;
diff --git a/source/backends/vulkan/memoryallocator.h b/source/backends/vulkan/memoryallocator.h
index 3e1861ba..0b185585 100644
--- a/source/backends/vulkan/memoryallocator.h
+++ b/source/backends/vulkan/memoryallocator.h
@@ -64,9 +64,9 @@ public:
 	~MemoryAllocator();
 
 private:
-	unsigned find_memory_pool(unsigned, MemoryType);
+	unsigned find_memory_pool(unsigned, MemoryType) const;
 	unsigned create_region(unsigned, size_t, bool);
-	std::vector<unsigned>::iterator lower_bound_by_size(std::vector<unsigned> &, std::size_t);
+	std::vector<unsigned>::iterator lower_bound_by_size(std::vector<unsigned> &, std::size_t) const;
 	unsigned allocate(std::size_t, std::size_t, unsigned, MemoryType);
 	unsigned split_block(unsigned, std::size_t);
 	void consolidate(unsigned);
-- 
2.45.2