From bafb06e50d291f1d538a2b00427593edfa9624eb Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Wed, 11 Apr 2018 16:30:21 +0200 Subject: [PATCH] Minor fix in VmaBlockVector::CalcMaxBlockSize for compilation in Visual Studio 2012 32-bit. Thanks @DominikWitczakAMD ! --- src/vk_mem_alloc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h index 0d9ee69..3a6a6a5 100644 --- a/src/vk_mem_alloc.h +++ b/src/vk_mem_alloc.h @@ -4246,7 +4246,7 @@ private: bool m_HasEmptyBlock; VmaDefragmentator* m_pDefragmentator; - size_t CalcMaxBlockSize() const; + VkDeviceSize CalcMaxBlockSize() const; // Finds and removes given block from vector. void Remove(VmaDeviceMemoryBlock* pBlock); @@ -6882,12 +6882,12 @@ void VmaBlockVector::Free( } } -size_t VmaBlockVector::CalcMaxBlockSize() const +VkDeviceSize VmaBlockVector::CalcMaxBlockSize() const { - size_t result = 0; + VkDeviceSize result = 0; for(size_t i = m_Blocks.size(); i--; ) { - result = VMA_MAX((uint64_t)result, (uint64_t)m_Blocks[i]->m_Metadata.GetSize()); + result = VMA_MAX(result, m_Blocks[i]->m_Metadata.GetSize()); if(result >= m_PreferredBlockSize) { break;