fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-03-13 22:34:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

benchmarking vertex arrays again

Browse source
This commit is contained in:
Eric Wasylishen 2014-10-16 22:25:29 -06:00
parent 9964eb811a
commit 217cff179b
2 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quakespasm/Quake/r_brush.c
View file

@ -971,6 +971,7 @@ surfaces from world + all brush models
*/
void GL_BuildVBOs (void)
{
#if 0
unsigned int numverts, varray_bytes, varray_index;
int i, j;
qmodel_t *m;
@ -1038,6 +1039,7 @@ void GL_BuildVBOs (void)
GL_ClientActiveTextureFunc (GL_TEXTURE2_ARB);
glTexCoordPointer (2, GL_FLOAT, VERTEXSIZE * sizeof(float), ((float *)0) + 3);
glEnableClientState (GL_TEXTURE_COORD_ARRAY);
#endif
}
/*

41
quakespasm/Quake/r_world.c
View file

@ -430,20 +430,24 @@ Writes out the triangle indices needed to draw s as a triangle list.
The number of indices it will write is given by R_NumTriangleIndicesForSurf.
================
*/
static void R_TriangleIndicesForSurf (msurface_t *s, unsigned int *dest)
static void R_TriangleIndicesForSurf (msurface_t *s, unsigned short *dest, int firstvert)
{
int i;
for (i=2; i<s->numedges; i++)
{
*dest++ = s->vbo_firstvert;
*dest++ = s->vbo_firstvert + i - 1;
*dest++ = s->vbo_firstvert + i;
*dest++ = firstvert;
*dest++ = firstvert + i - 1;
*dest++ = firstvert + i;
}
}
#define VERTEXBYTES (VERTEXSIZE * sizeof(float))
#define MAX_BATCH_SIZE 4096
static unsigned int vbo_indices[MAX_BATCH_SIZE];
static float verts[MAX_BATCH_SIZE * VERTEXSIZE];
static unsigned int num_verts;
static unsigned short vbo_indices[MAX_BATCH_SIZE];
static unsigned int num_vbo_indices;
/*
@ -454,6 +458,7 @@ R_ClearBatch
static void R_ClearBatch ()
{
num_vbo_indices = 0;
num_verts = 0;
}
/*
@ -467,8 +472,9 @@ static void R_FlushBatch ()
{
if (num_vbo_indices > 0)
{
glDrawElements (GL_TRIANGLES, num_vbo_indices, GL_UNSIGNED_INT, vbo_indices);
glDrawElements (GL_TRIANGLES, num_vbo_indices, GL_UNSIGNED_SHORT, vbo_indices);
num_vbo_indices = 0;
num_verts = 0;
}
}
@ -489,8 +495,11 @@ static void R_BatchSurface (msurface_t *s)
if (num_vbo_indices + num_surf_indices > MAX_BATCH_SIZE)
R_FlushBatch();
R_TriangleIndicesForSurf (s, &vbo_indices[num_vbo_indices]);
memcpy(verts + (VERTEXSIZE * num_verts), s->polys->verts, VERTEXBYTES * s->numedges);
R_TriangleIndicesForSurf (s, &vbo_indices[num_vbo_indices], num_verts);
num_vbo_indices += num_surf_indices;
num_verts += s->numedges;
}
/*
@ -787,6 +796,24 @@ void R_DrawTextureChains_Multitexture_VBO (qmodel_t *model, entity_t *ent, texch
int lastlightmap;
gltexture_t *fullbright = NULL;
// setup vertex array. this will need to move if we use vertex arrays for other things
glVertexPointer (3, GL_FLOAT, VERTEXSIZE * sizeof(float), ((float *)verts));
glEnableClientState (GL_VERTEX_ARRAY);
GL_ClientActiveTextureFunc (GL_TEXTURE0_ARB);
glTexCoordPointer (2, GL_FLOAT, VERTEXSIZE * sizeof(float), ((float *)verts) + 3);
glEnableClientState (GL_TEXTURE_COORD_ARRAY);
GL_ClientActiveTextureFunc (GL_TEXTURE1_ARB);
glTexCoordPointer (2, GL_FLOAT, VERTEXSIZE * sizeof(float), ((float *)verts) + 5);
glEnableClientState (GL_TEXTURE_COORD_ARRAY);
// TMU 2 is for fullbrights; same texture coordinates as TMU 0
GL_ClientActiveTextureFunc (GL_TEXTURE2_ARB);
glTexCoordPointer (2, GL_FLOAT, VERTEXSIZE * sizeof(float), ((float *)verts) + 3);
glEnableClientState (GL_TEXTURE_COORD_ARRAY);
// Setup TMU 1 (lightmap)
GL_SelectTexture (GL_TEXTURE1_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);