VertexLoader: Fix wrong array being used if color 1 is present but color 0 isn't

This worked correctly on the JIT vertex loaders, and for the equivalent case with texture coordinates. I'm not aware of any games this affects (but libogc does mention a semi-related scenario at 6bc0317c7d/gc/ogc/gx.h (L1855-L1857).)
This commit is contained in:
Pokechu22
2023-12-02 14:14:58 -08:00
parent 1ee6824324
commit 36796abc08
3 changed files with 20 additions and 0 deletions

View File

@ -149,9 +149,16 @@ void VertexLoader::CompileVertexTranslator()
VertexLoader_Color::GetFunction(m_VtxDesc.low.Color[i], m_VtxAttr.GetColorFormat(i));
if (pFunc != nullptr)
{
WriteCall(pFunc);
}
else
{
ASSERT(m_VtxDesc.low.Color[i] == VertexComponentFormat::NotPresent);
// Keep colIndex in sync if color 0 is absent but color 1 is present
if (i == 0 && m_VtxDesc.low.Color[1] != VertexComponentFormat::NotPresent)
WriteCall(VertexLoader_Color::GetDummyFunction());
}
if (m_VtxDesc.low.Color[i] != VertexComponentFormat::NotPresent)
{