piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

PortableVertexFormat: use AttributeFormat for color attribute format

Browse Source
This commit is contained in:
degasus
2014-01-24 15:23:50 +01:00
parent b38ef39ab7
commit ef2d6e7d53
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,9 +87,8 @@ struct PortableVertexDeclaration
AttributeFormat position;
AttributeFormat normals[3];
AttributeFormat colors[2];
VarType color_gl_type; // always GL_UNSIGNED_BYTE
int color_offset[2];
VarType texcoord_gl_type[8];
//int texcoord_gl_size[8];
int texcoord_offset[8];

13
Source/Core/VideoCommon/VertexLoader.cpp
View File

@ -627,17 +627,14 @@ void VertexLoader::CompileVertexTranslator()
components |= VB_HAS_NRM1 | VB_HAS_NRM2;
}
vtx_decl.color_gl_type = VAR_UNSIGNED_BYTE;
vtx_decl.color_offset[0] = -1;
vtx_decl.color_offset[1] = -1;
for (int i = 0; i < 2; i++)
{
components |= VB_HAS_COL0 << i;
vtx_decl.colors[i].components = 4;
vtx_decl.colors[i].type = VAR_UNSIGNED_BYTE;
vtx_decl.colors[i].integer = false;
switch (col[i])
{
case NOT_PRESENT:
components &= ~(VB_HAS_COL0 << i);
vtx_decl.color_offset[i] = -1;
break;
case DIRECT:
switch (m_VtxAttr.color[i].Comp)
@ -681,7 +678,9 @@ void VertexLoader::CompileVertexTranslator()
// Common for the three bottom cases
if (col[i] != NOT_PRESENT)
{
vtx_decl.color_offset[i] = nat_offset;
components |= VB_HAS_COL0 << i;
vtx_decl.colors[i].offset = nat_offset;
vtx_decl.colors[i].enable = true;
nat_offset += 4;
}
}