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

IndexGenerator: drop unused variable

Browse Source
This commit is contained in:
degasus
2014-01-16 13:56:20 +01:00
parent 6b01839525
commit 1d6425bd5e
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/VideoCommon/IndexGenerator.cpp
View File

@ -11,7 +11,6 @@
//Init //Init
u16 *IndexGenerator::Iptr; u16 *IndexGenerator::Iptr;
u16 *IndexGenerator::BASEIptr; u16 *IndexGenerator::BASEIptr;
u32 IndexGenerator::numI;
u32 IndexGenerator::index; u32 IndexGenerator::index;
static const u16 s_primitive_restart = -1; static const u16 s_primitive_restart = -1;
@ -45,7 +44,6 @@ void IndexGenerator::Start(u16* Indexptr)
Iptr = Indexptr; Iptr = Indexptr;
BASEIptr = Indexptr; BASEIptr = Indexptr;
index = 0; index = 0;
numI = 0;
} }
void IndexGenerator::AddIndices(int primitive, u32 numVerts) void IndexGenerator::AddIndices(int primitive, u32 numVerts)
@ -62,8 +60,6 @@ template <bool pr> __forceinline void IndexGenerator::WriteTriangle(u32 index1,
*Iptr++ = index3; *Iptr++ = index3;
if(pr) if(pr)
*Iptr++ = s_primitive_restart; *Iptr++ = s_primitive_restart;
++numI;
} }
template <bool pr> void IndexGenerator::AddList(u32 const numVerts) template <bool pr> void IndexGenerator::AddList(u32 const numVerts)
@ -83,7 +79,6 @@ template <bool pr> void IndexGenerator::AddStrip(u32 const numVerts)
*Iptr++ = index + i; *Iptr++ = index + i;
} }
*Iptr++ = s_primitive_restart; *Iptr++ = s_primitive_restart;
numI += numVerts - 2;
} }
else else
@ -134,7 +129,6 @@ template <bool pr> void IndexGenerator::AddFan(u32 numVerts)
*Iptr++ = index + i + 1; *Iptr++ = index + i + 1;
*Iptr++ = index + i + 2; *Iptr++ = index + i + 2;
*Iptr++ = s_primitive_restart; *Iptr++ = s_primitive_restart;
numI += 3;
} }
for(; i+2<=numVerts; i+=2) for(; i+2<=numVerts; i+=2)
@ -144,7 +138,6 @@ template <bool pr> void IndexGenerator::AddFan(u32 numVerts)
*Iptr++ = index; *Iptr++ = index;
*Iptr++ = index + i + 1; *Iptr++ = index + i + 1;
*Iptr++ = s_primitive_restart; *Iptr++ = s_primitive_restart;
numI += 2;
} }
} }
@ -183,7 +176,6 @@ template <bool pr> void IndexGenerator::AddQuads(u32 numVerts)
*Iptr++ = index + i - 3; *Iptr++ = index + i - 3;
*Iptr++ = index + i - 0; *Iptr++ = index + i - 0;
*Iptr++ = s_primitive_restart; *Iptr++ = s_primitive_restart;
numI += 2;
} }
else else
{ {
@ -206,7 +198,6 @@ void IndexGenerator::AddLineList(u32 numVerts)
{ {
*Iptr++ = index + i - 1; *Iptr++ = index + i - 1;
*Iptr++ = index + i; *Iptr++ = index + i;
++numI;
} }
} }
@ -219,7 +210,6 @@ void IndexGenerator::AddLineStrip(u32 numVerts)
{ {
*Iptr++ = index + i - 1; *Iptr++ = index + i - 1;
*Iptr++ = index + i; *Iptr++ = index + i;
++numI;
} }
} }
@ -229,7 +219,6 @@ void IndexGenerator::AddPoints(u32 numVerts)
for (u32 i = 0; i != numVerts; ++i) for (u32 i = 0; i != numVerts; ++i)
{ {
*Iptr++ = index + i; *Iptr++ = index + i;
++numI;
} }
} }

15
Source/Core/VideoCommon/IndexGenerator.h
View File

@ -18,24 +18,13 @@ public:
static void AddIndices(int primitive, u32 numVertices); static void AddIndices(int primitive, u32 numVertices);
// Interface
static u32 GetNumIndices() {return numI;}
// returns numprimitives // returns numprimitives
static u32 GetNumVerts() {return index;} static u32 GetNumVerts() {return index;}
static u32 GetIndexLen() {return (u32)(Iptr - BASEIptr);} static u32 GetIndexLen() {return (u32)(Iptr - BASEIptr);}
static u32 GetRemainingIndices(); static u32 GetRemainingIndices();
/*
enum IndexPrimitiveType
{
Prim_None = 0,
Prim_List,
Prim_Strip,
Prim_Fan
};
*/
private: private:
// Triangles // Triangles
template <bool pr> static void AddList(u32 numVerts); template <bool pr> static void AddList(u32 numVerts);
@ -54,8 +43,6 @@ private:
static u16 *Iptr; static u16 *Iptr;
static u16 *BASEIptr; static u16 *BASEIptr;
// TODO: redundant variables
static u32 numI;
static u32 index; static u32 index;
}; };