Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bkaradzic/bx

Browse Source
This commit is contained in:
Branimir Karadžić
2018-02-17 12:26:50 -08:00
parent daa7f8619e 52b2cca667
commit 40092c8f26
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/bx/inline/allocator.inl
View File

@@ -57,9 +57,10 @@ namespace bx
inline void* alignedAlloc(AllocatorI* _allocator, size_t _size, size_t _align, const char* _file, uint32_t _line)
{
size_t total = _size + _align;
const size_t align = max(_align, sizeof(uint32_t) );;
const size_t total = _size + align;
uint8_t* ptr = (uint8_t*)alloc(_allocator, total, 0, _file, _line);
uint8_t* aligned = (uint8_t*)alignPtr(ptr, sizeof(uint32_t), _align);
uint8_t* aligned = (uint8_t*)alignPtr(ptr, sizeof(uint32_t), align);
uint32_t* header = (uint32_t*)aligned - 1;
*header = uint32_t(aligned - ptr);
return aligned;
@@ -84,9 +85,11 @@ namespace bx
uint8_t* aligned = (uint8_t*)_ptr;
uint32_t offset = *( (uint32_t*)aligned - 1);
uint8_t* ptr = aligned - offset;
size_t total = _size + _align;
const size_t align = max(_align, sizeof(uint32_t) );;
const size_t total = _size + align;
ptr = (uint8_t*)realloc(_allocator, ptr, total, 0, _file, _line);
uint8_t* newAligned = (uint8_t*)alignPtr(ptr, sizeof(uint32_t), _align);
uint8_t* newAligned = (uint8_t*)alignPtr(ptr, sizeof(uint32_t), align);
if (newAligned == aligned)
{