mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes to the triangle dropping logic

Browse Source
This commit is contained in:
Luke Benstead 2018-06-13 21:21:36 +01:00
parent 299df08111
commit 713fc0a396
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GL/draw.c
View File

@ -379,7 +379,6 @@ static void submitVertices(GLenum mode, GLsizei first, GLsizei count, GLenum typ
* more vertices (i == count - 1) we can just drop the final vertex. * more vertices (i == count - 1) we can just drop the final vertex.
* By first triangle, it means that rel == 2 or dst - 3 is marked as a "last" vertex. * By first triangle, it means that rel == 2 or dst - 3 is marked as a "last" vertex.
*/ */
fprintf(stderr, "Dropping triangle\n");
/* Is this the first triangle in the strip? */ /* Is this the first triangle in the strip? */
GLboolean first_triangle = (rel == 2) || ((vertex - 3)->flags == PVR_CMD_VERTEX_EOL); GLboolean first_triangle = (rel == 2) || ((vertex - 3)->flags == PVR_CMD_VERTEX_EOL);
@ -425,7 +424,7 @@ static void submitVertices(GLenum mode, GLsizei first, GLsizei count, GLenum typ
aligned_vector_extend(list_vector, 1); aligned_vector_extend(list_vector, 1);
/* Deal with any realloc that just happened */ /* Deal with any realloc that just happened */
dst = aligned_vector_at(list_vector, i); dst = aligned_vector_at(list_vector, rel);
vertex = (pvr_vertex_t*) dst; vertex = (pvr_vertex_t*) dst;
/* Set up the output pointers */ /* Set up the output pointers */
@ -437,9 +436,12 @@ static void submitVertices(GLenum mode, GLsizei first, GLsizei count, GLenum typ
/* Mark second vertex as the end of the strip, duplicate the second vertex /* Mark second vertex as the end of the strip, duplicate the second vertex
* to create the start of the next strip * to create the start of the next strip
*/ */
vout[1]->flags = PVR_CMD_VERTEX_EOL;
*vout[3] = *Triangle.vin[1]; *vout[3] = *Triangle.vin[1];
vout[1]->flags = PVR_CMD_VERTEX_EOL;
vout[2]->flags = PVR_CMD_VERTEX;
vout[3]->flags = PVR_CMD_VERTEX;
dst = (PVRCommand*) vout[3]; dst = (PVRCommand*) vout[3];
vertex = vout[3]; vertex = vout[3];