v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update StackAllocator.inl

pull/5096/head
Kim Kulling 2023-05-15 15:09:54 +02:00 committed by GitHub
parent b5b6400320
commit 8ad4bb0b2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/Common/StackAllocator.inl
View File

@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
Copyright (c) 2006-2022, assimp team Copyright (c) 2006-2022, assimp team
All rights reserved. All rights reserved.
Redistribution and use of this software in source and binary forms, Redistribution and use of this software in source and binary forms,
@ -45,7 +44,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using namespace Assimp; using namespace Assimp;
inline StackAllocator::StackAllocator() { inline StackAllocator::StackAllocator() {
} }
@ -60,7 +58,7 @@ inline void *StackAllocator::Allocate(size_t byteSize) {
// Block size must be at least as large as byteSize, but we want to use this for small allocations anyway. // Block size must be at least as large as byteSize, but we want to use this for small allocations anyway.
m_blockAllocationSize = std::max(std::min(m_blockAllocationSize * 2, g_maxBytesPerBlock), byteSize); m_blockAllocationSize = std::max(std::min(m_blockAllocationSize * 2, g_maxBytesPerBlock), byteSize);
uint8_t *data = new uint8_t[m_blockAllocationSize]; uint8_t *data = new uint8_t[m_blockAllocationSize];
m_storageBlocks.push_back(data); m_storageBlocks.emplace_back(data);
m_subIndex = byteSize; m_subIndex = byteSize;
return data; return data;
} }
@ -76,7 +74,7 @@ inline void StackAllocator::FreeAll() {
for (size_t i = 0; i < m_storageBlocks.size(); i++) { for (size_t i = 0; i < m_storageBlocks.size(); i++) {
delete [] m_storageBlocks[i]; delete [] m_storageBlocks[i];
} }
std::deque<uint8_t *> empty; std::vector<uint8_t *> empty;
m_storageBlocks.swap(empty); m_storageBlocks.swap(empty);
// start over: // start over:
m_blockAllocationSize = g_startBytesPerBlock; m_blockAllocationSize = g_startBytesPerBlock;