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

Fix crash on incorrect index buffer size when building mesh buffers via MeshAccessor

Browse Source 
#3246
This commit is contained in:
Wojtek Figat
2025-02-24 23:28:35 +01:00
parent 2ab9adab24
commit 754d321ef0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Engine/Graphics/Models/MeshBase.cpp
View File

@@ -207,7 +207,7 @@ bool MeshAccessor::UpdateMesh(MeshBase* mesh, bool calculateBounds)
{ {
ibData = _data[IB].Get(); ibData = _data[IB].Get();
use16BitIndexBuffer = _formats[IB] == PixelFormat::R16_UInt; use16BitIndexBuffer = _formats[IB] == PixelFormat::R16_UInt;
triangles = _data[IB].Length() / PixelFormatExtensions::SizeInBytes(_formats[IB]); triangles = _data[IB].Length() / PixelFormatExtensions::SizeInBytes(_formats[IB]) / 3;
} }
if (mesh->Init(vertices, triangles, vbData, ibData, use16BitIndexBuffer, vbLayout)) if (mesh->Init(vertices, triangles, vbData, ibData, use16BitIndexBuffer, vbLayout))
@@ -340,6 +340,11 @@ bool MeshBase::Init(uint32 vertices, uint32 triangles, const Array<const void*,
CHECK_RETURN(vbData.HasItems() && vertices, true); CHECK_RETURN(vbData.HasItems() && vertices, true);
CHECK_RETURN(ibData, true); CHECK_RETURN(ibData, true);
CHECK_RETURN(vbLayout.Count() >= vbData.Count(), true); CHECK_RETURN(vbLayout.Count() >= vbData.Count(), true);
const uint32 indices = triangles * 3;
if (use16BitIndexBuffer)
{
CHECK_RETURN(indices <= MAX_uint16, true);
}
ASSERT(_model); ASSERT(_model);
GPUBuffer* vertexBuffer0 = nullptr; GPUBuffer* vertexBuffer0 = nullptr;
GPUBuffer* vertexBuffer1 = nullptr; GPUBuffer* vertexBuffer1 = nullptr;
@@ -369,7 +374,7 @@ bool MeshBase::Init(uint32 vertices, uint32 triangles, const Array<const void*,
goto ERROR_LOAD_END; goto ERROR_LOAD_END;
} }
indexBuffer = GPUDevice::Instance->CreateBuffer(MESH_BUFFER_NAME(".IB")); indexBuffer = GPUDevice::Instance->CreateBuffer(MESH_BUFFER_NAME(".IB"));
if (indexBuffer->Init(GPUBufferDescription::Index(use16BitIndexBuffer ? sizeof(uint16) : sizeof(uint32), triangles * 3, ibData))) if (indexBuffer->Init(GPUBufferDescription::Index(use16BitIndexBuffer ? sizeof(uint16) : sizeof(uint32), indices, ibData)))
goto ERROR_LOAD_END; goto ERROR_LOAD_END;
// Init collision proxy // Init collision proxy