ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VideoCommon/VertexLoader: Remove NRM enum

This commit is contained in:
Jens Nyberg 2014-03-26 22:54:40 +01:00
parent f6a343df79
commit 0c62ae9c1a
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,10 +613,8 @@ void VertexLoader::CompileVertexTranslator()
nat_offset += 12; nat_offset += 12;
} }
int numNormals = (m_VtxAttr.NormalElements == 1) ? NRM_THREE : NRM_ONE;
components |= VB_HAS_NRM0; components |= VB_HAS_NRM0;
if (m_VtxAttr.NormalElements == 1)
if (numNormals == NRM_THREE)
components |= VB_HAS_NRM1 | VB_HAS_NRM2; components |= VB_HAS_NRM1 | VB_HAS_NRM2;
} }

7
Source/Core/VideoCommon/VertexLoader.h
View File

@ -107,13 +107,6 @@ public:
int GetNumLoadedVerts() const { return m_numLoadedVertices; } int GetNumLoadedVerts() const { return m_numLoadedVertices; }
private: private:
enum
{
NRM_ZERO = 0,
NRM_ONE = 1,
NRM_THREE = 3,
};
int m_VertexSize; // number of bytes of a raw GC vertex. Computed by CompileVertexTranslator. int m_VertexSize; // number of bytes of a raw GC vertex. Computed by CompileVertexTranslator.
// GC vertex format // GC vertex format