GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix render memory alignment issues to prevent crashes on Android

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Engine/Renderer/RenderList.cpp
View File

@@ -463,20 +463,20 @@ bool DrawCallsList::IsEmpty() const
RenderListAlloc::~RenderListAlloc()
{
if (!List && Data) // Render List memory doesn't need free (arena allocator)
if (NeedFree && Data) // Render List memory doesn't need free (arena allocator)
RendererAllocation::Free(Data, Size);
}
void* RenderListAlloc::Init(RenderList* list, uintptr size, uintptr alignment)
void* RenderListAlloc::Init(RenderList* list, uint32 size, uint32 alignment)
{
ASSERT_LOW_LAYER(!Data);
Size = size;
bool useList = alignment <= 16 && size < 1024;
List = useList ? list : nullptr;
if (useList)
Data = list->Memory.Allocate(size, alignment);
else
Data = RendererAllocation::Allocate(size);
if (size == 0)
return nullptr;
if (size < 1024 || (alignment != 16 && alignment != 8 && alignment != 4 && alignment != 1))
return (Data = list->Memory.Allocate(size, alignment));
NeedFree = true;
Data = RendererAllocation::Allocate(size);
return Data;
}

8
Source/Engine/Renderer/RenderList.h
View File

@@ -281,16 +281,16 @@ struct DrawCallsList
// Small utility for allocating memory from RenderList arena pool with automatic fallback to shared RendererAllocation for larger memory blocks.
struct RenderListAlloc
{
RenderList* List;
void* Data = nullptr;
uintptr Size;
uint32 Size = 0;
bool NeedFree = false;
~RenderListAlloc();
void* Init(RenderList* list, uintptr size, uintptr alignment = 1);
void* Init(RenderList* list, uint32 size, uint32 alignment = 1);
template<typename T>
FORCE_INLINE T* Init(RenderList* list, int32 count, uintptr alignment = 1)
FORCE_INLINE T* Init(RenderList* list, int32 count, uint32 alignment = 1)
{
return (T*)Init(list, count * sizeof(T), alignment);
}