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

minor speedup in gfx3d: build verts directly into the main vertex list instead of a 32B temp struct which needs to be copied each time a poly is completed.

This commit is contained in:
zeromus 2008-12-27 05:58:37 +00:00
parent de0120d6bb
commit 71a93841c9
2 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
desmume/src/gfx3d.cpp
View File

@ -153,7 +153,13 @@ int listTwiddle = 1;
int triStripToggle; int triStripToggle;
//list-building state //list-building state
VERTLIST tempVertList; struct {
//the number of verts registered in this list
int count;
//indices to the main vert list
int map[4];
} tempVertInfo;
static void twiddleLists() { static void twiddleLists() {
listTwiddle++; listTwiddle++;
@ -478,12 +484,12 @@ void gfx3d_glBegin(unsigned long v)
{ {
vtxFormat = v&0x03; vtxFormat = v&0x03;
triStripToggle = 0; triStripToggle = 0;
tempVertList.count = 0; tempVertInfo.count = 0;
} }
void gfx3d_glEnd(void) void gfx3d_glEnd(void)
{ {
tempVertList.count = 0; tempVertInfo.count = 0;
} }
void gfx3d_glColor3b(unsigned long v) void gfx3d_glColor3b(unsigned long v)
@ -493,6 +499,12 @@ void gfx3d_glColor3b(unsigned long v)
colorRGB[2] = ((v>>10)&0x1F); colorRGB[2] = ((v>>10)&0x1F);
} }
static void SUBMITVERTEX(int i, int n)
{
polylist->list[polylist->count].vertIndexes[i] = tempVertInfo.map[n];
}
//Submit a vertex to the GE //Submit a vertex to the GE
static void SetVertex() static void SetVertex()
{ {
@ -530,7 +542,8 @@ static void SetVertex()
//TODO - viewport transform //TODO - viewport transform
//record the vertex //record the vertex
VERT &vert = tempVertList.list[tempVertList.count]; //VERT &vert = tempVertList.list[tempVertList.count];
VERT &vert = vertlist->list[vertlist->count + tempVertInfo.count];
vert.texcoord[0] = last_s; vert.texcoord[0] = last_s;
vert.texcoord[1] = last_t; vert.texcoord[1] = last_t;
vert.coord[0] = coordTransformed[0]; vert.coord[0] = coordTransformed[0];
@ -542,51 +555,58 @@ static void SetVertex()
vert.color[2] = colorRGB[2]; vert.color[2] = colorRGB[2];
vert.color[3] = colorRGB[3]; vert.color[3] = colorRGB[3];
vert.depth = 0x7FFF * coordTransformed[2]; vert.depth = 0x7FFF * coordTransformed[2];
tempVertList.count++; tempVertInfo.map[tempVertInfo.count] = vertlist->count + tempVertInfo.count;
tempVertInfo.count++;
//possibly complete a polygon //possibly complete a polygon
{ {
#define SUBMITVERTEX(i,n) vertlist->list[polylist->list[polylist->count].vertIndexes[i] = vertlist->count++] = tempVertList.list[n];
int completed=0; int completed=0;
switch(vtxFormat) { switch(vtxFormat) {
case 0: //GL_TRIANGLES case 0: //GL_TRIANGLES
if(tempVertList.count!=3) if(tempVertInfo.count!=3)
break; break;
completed = 1; completed = 1;
//vertlist->list[polylist->list[polylist->count].vertIndexes[i] = vertlist->count++] = tempVertList.list[n];
SUBMITVERTEX(0,0); SUBMITVERTEX(0,0);
SUBMITVERTEX(1,1); SUBMITVERTEX(1,1);
SUBMITVERTEX(2,2); SUBMITVERTEX(2,2);
vertlist->count+=3;
polylist->list[polylist->count].type = 3; polylist->list[polylist->count].type = 3;
tempVertList.count = 0; tempVertInfo.count = 0;
break; break;
case 1: //GL_QUADS case 1: //GL_QUADS
if(tempVertList.count!=4) if(tempVertInfo.count!=4)
break; break;
completed = 1; completed = 1;
SUBMITVERTEX(0,0); SUBMITVERTEX(0,0);
SUBMITVERTEX(1,1); SUBMITVERTEX(1,1);
SUBMITVERTEX(2,2); SUBMITVERTEX(2,2);
SUBMITVERTEX(3,3); SUBMITVERTEX(3,3);
vertlist->count+=4;
polylist->list[polylist->count].type = 4; polylist->list[polylist->count].type = 4;
tempVertList.count = 0; tempVertInfo.count = 0;
break; break;
case 2: //GL_TRIANGLE_STRIP case 2: //GL_TRIANGLE_STRIP
if(tempVertList.count!=3) if(tempVertInfo.count!=3)
break; break;
completed = 1; completed = 1;
SUBMITVERTEX(0,0); SUBMITVERTEX(0,0);
SUBMITVERTEX(1,1); SUBMITVERTEX(1,1);
SUBMITVERTEX(2,2); SUBMITVERTEX(2,2);
polylist->list[polylist->count].type = 3; polylist->list[polylist->count].type = 3;
if(triStripToggle) if(triStripToggle)
tempVertList.list[1] = tempVertList.list[2]; tempVertInfo.map[1] = vertlist->count+2;
else else
tempVertList.list[0] = tempVertList.list[2]; tempVertInfo.map[0] = vertlist->count+2;
vertlist->count+=3;
triStripToggle ^= 1; triStripToggle ^= 1;
tempVertList.count = 2; tempVertInfo.count = 2;
break; break;
case 3: //GL_QUAD_STRIP case 3: //GL_QUAD_STRIP
if(tempVertList.count!=4) if(tempVertInfo.count!=4)
break; break;
completed = 1; completed = 1;
SUBMITVERTEX(0,0); SUBMITVERTEX(0,0);
@ -594,9 +614,10 @@ static void SetVertex()
SUBMITVERTEX(2,3); SUBMITVERTEX(2,3);
SUBMITVERTEX(3,2); SUBMITVERTEX(3,2);
polylist->list[polylist->count].type = 4; polylist->list[polylist->count].type = 4;
tempVertList.list[0] = tempVertList.list[2]; tempVertInfo.map[0] = vertlist->count+2;
tempVertList.list[1] = tempVertList.list[3]; tempVertInfo.map[1] = vertlist->count+3;
tempVertList.count = 2; vertlist->count+=4;
tempVertInfo.count = 2;
break; break;
} }
@ -1684,7 +1705,7 @@ SFORMAT SF_GFX3D[]={
{ "GSFO", 4, 1, &gfx3d.fogOffset}, { "GSFO", 4, 1, &gfx3d.fogOffset},
{ "GSTT", 4, 32, gfx3d.rgbToonTable}, { "GSTT", 4, 32, gfx3d.rgbToonTable},
{ "GSST", 4, 128, shininessTable}, { "GSST", 4, 128, shininessTable},
{ "GSSI", 2, 1, &shininessInd}, { "GSSI", 4, 1, &shininessInd},
{ 0 } { 0 }
}; };

2
desmume/src/readwrite.cpp
View File

@ -133,4 +133,4 @@ int read32le(u32 *Bufo, std::istream *is)
#endif #endif
return 1; return 1;
} }