piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

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

7
Source/Core/VideoCommon/VertexLoader.cpp
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)
{

10
Source/Core/VideoCommon/VertexLoader_Color.cpp
View File

@ -16,6 +16,11 @@
namespace
{
void Color_Read_Dummy(VertexLoader* loader)
{
loader->m_colIndex++;
}
constexpr u32 alpha_mask = 0xFF000000;
void SetCol(VertexLoader* loader, u32 val)
@ -201,3 +206,8 @@ TPipelineFunction VertexLoader_Color::GetFunction(VertexComponentFormat type, Co
}
return s_table_read_color[type][format];
}
TPipelineFunction VertexLoader_Color::GetDummyFunction()
{
return Color_Read_Dummy;
}

3
Source/Core/VideoCommon/VertexLoader_Color.h
View File

@ -25,6 +25,9 @@ public:
static TPipelineFunction GetFunction(VertexComponentFormat type, ColorFormat format);
// It is important to synchronize colIndex, or else the wrong color array will be used
static TPipelineFunction GetDummyFunction();
private:
template <typename T, auto last_member>
using EnumMap = typename Common::EnumMap<T, last_member>;