H3cJP/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-03-18 19:32:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14432 from Dentomologist/vertexloadermanager_fix_crash_from_invalid_array_base

Browse Source 
VertexLoaderManager: Fix crash caused by invalid array base
This commit is contained in:
JMC47 2026-03-02 19:39:55 -05:00 committed by GitHub
commit 5c62c90d35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/VideoCommon/VertexLoaderManager.cpp
View File

@ -91,25 +91,30 @@ void UpdateVertexArrayPointers()
// Note: Only array bases 0 through 11 are used by the Vertex loaders.
// 12 through 15 are used for loading data into xfmem.
// We also only update the array base if the vertex description states we are going to use it.
// TODO: For memory safety, we need to check the sizes returned by GetSpanForAddress
if (IsIndexed(g_main_cp_state.vtx_desc.low.Position))
{
cached_arraybases[CPArray::Position] =
memory.GetSpanForAddress(g_main_cp_state.array_bases[CPArray::Position]).data();
u8* const base_pointer =
memory.GetPointerForRange(g_main_cp_state.array_bases[CPArray::Position], sizeof(u32));
if (base_pointer != nullptr)
cached_arraybases[CPArray::Position] = base_pointer;
}
if (IsIndexed(g_main_cp_state.vtx_desc.low.Normal))
{
cached_arraybases[CPArray::Normal] =
memory.GetSpanForAddress(g_main_cp_state.array_bases[CPArray::Normal]).data();
u8* const base_pointer =
memory.GetPointerForRange(g_main_cp_state.array_bases[CPArray::Normal], sizeof(u32));
if (base_pointer != nullptr)
cached_arraybases[CPArray::Normal] = base_pointer;
}
for (u8 i = 0; i < g_main_cp_state.vtx_desc.low.Color.Size(); i++)
{
if (IsIndexed(g_main_cp_state.vtx_desc.low.Color[i]))
{
cached_arraybases[CPArray::Color0 + i] =
memory.GetSpanForAddress(g_main_cp_state.array_bases[CPArray::Color0 + i]).data();
u8* const base_pointer =
memory.GetPointerForRange(g_main_cp_state.array_bases[CPArray::Color0 + i], sizeof(u32));
if (base_pointer != nullptr)
cached_arraybases[CPArray::Color0 + i] = base_pointer;
}
}
@ -117,8 +122,10 @@ void UpdateVertexArrayPointers()
{
if (IsIndexed(g_main_cp_state.vtx_desc.high.TexCoord[i]))
{
cached_arraybases[CPArray::TexCoord0 + i] =
memory.GetSpanForAddress(g_main_cp_state.array_bases[CPArray::TexCoord0 + i]).data();
u8* const base_pointer = memory.GetPointerForRange(
g_main_cp_state.array_bases[CPArray::TexCoord0 + i], sizeof(u32));
if (base_pointer != nullptr)
cached_arraybases[CPArray::TexCoord0 + i] = base_pointer;
}
}