Fix render memory alignment issues to prevent crashes on Android

This commit is contained in:
Wojtek Figat
2025-09-06 23:36:54 +02:00
parent 857b0c5ac3
commit 44e70692a2
6 changed files with 32 additions and 21 deletions

View File

@@ -24,6 +24,11 @@ void ArenaAllocator::Free()
void* ArenaAllocator::Allocate(uint64 size, uint64 alignment)
{
if (size == 0)
return nullptr;
if (alignment < PLATFORM_MEMORY_ALIGNMENT)
alignment = PLATFORM_MEMORY_ALIGNMENT;
// Find the first page that has some space left
Page* page = _first;
while (page && page->Offset + size + alignment > page->Size)
@@ -79,6 +84,10 @@ void ConcurrentArenaAllocator::Free()
void* ConcurrentArenaAllocator::Allocate(uint64 size, uint64 alignment)
{
if (size == 0)
return nullptr;
if (alignment < PLATFORM_MEMORY_ALIGNMENT)
alignment = PLATFORM_MEMORY_ALIGNMENT;
RETRY:
// Check if the current page has some space left
@@ -120,6 +129,6 @@ RETRY:
_locker.Unlock();
// Use a single cde for allocation
// Use a single code for allocation
goto RETRY;
}

View File

@@ -79,7 +79,6 @@ private:
int64 Size;
};
int32 _pageSize;
volatile int64 _first = 0;
volatile int64 _totalBytes = 0;
void*(*_allocate1)(uint64 size, uint64 alignment) = nullptr;
@@ -87,19 +86,20 @@ private:
void*(*_allocate2)(uint64 size) = nullptr;
void(*_free2)(void* ptr, uint64 size) = nullptr;
CriticalSection _locker;
int32 _pageSize;
public:
ConcurrentArenaAllocator(int32 pageSizeBytes, void* (*customAllocate)(uint64 size, uint64 alignment), void(*customFree)(void* ptr))
: _pageSize(pageSizeBytes)
, _allocate1(customAllocate)
: _allocate1(customAllocate)
, _free1(customFree)
, _pageSize(pageSizeBytes)
{
}
ConcurrentArenaAllocator(int32 pageSizeBytes, void* (*customAllocate)(uint64 size), void(*customFree)(void* ptr, uint64 size))
: _pageSize(pageSizeBytes)
, _allocate2(customAllocate)
: _allocate2(customAllocate)
, _free2(customFree)
, _pageSize(pageSizeBytes)
{
}
@@ -120,7 +120,7 @@ public:
}
// Allocates a chunk of unitialized memory.
void* Allocate(uint64 size, uint64 alignment = 1);
void* Allocate(uint64 size, uint64 alignment = PLATFORM_MEMORY_ALIGNMENT);
// Frees all memory allocations within allocator.
void Free();

View File

@@ -11,14 +11,13 @@
class CrtAllocator
{
public:
/// <summary>
/// Allocates memory on a specified alignment boundary.
/// </summary>
/// <param name="size">The size of the allocation (in bytes).</param>
/// <param name="alignment">The memory alignment (in bytes). Must be an integer power of 2.</param>
/// <returns>The pointer to the allocated chunk of the memory. The pointer is a multiple of alignment.</returns>
FORCE_INLINE static void* Allocate(uint64 size, uint64 alignment = 16)
FORCE_INLINE static void* Allocate(uint64 size, uint64 alignment = PLATFORM_MEMORY_ALIGNMENT)
{
return Platform::Allocate(size, alignment);
}