summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/renderergl2/tr_bsp.c214
1 files changed, 60 insertions, 154 deletions
diff --git a/src/renderergl2/tr_bsp.c b/src/renderergl2/tr_bsp.c
index 9af9c094..2867d13e 100644
--- a/src/renderergl2/tr_bsp.c
+++ b/src/renderergl2/tr_bsp.c
@@ -1863,6 +1863,7 @@ static void R_CreateWorldVBOs(void)
numSortedSurfaces = 0;
for(surface = &s_worldData.surfaces[0]; surface < &s_worldData.surfaces[s_worldData.numsurfaces]; surface++)
{
+ srfBspSurface_t *bspSurf;
shader_t *shader = surface->shader;
if (shader->isPortal)
@@ -1874,9 +1875,15 @@ static void R_CreateWorldVBOs(void)
if (ShaderRequiresCPUDeforms(shader))
continue;
+ // check for this now so we can use srfBspSurface_t* universally in the rest of the function
if (!(*surface->data == SF_FACE || *surface->data == SF_GRID || *surface->data == SF_TRIANGLES))
continue;
+ bspSurf = (srfBspSurface_t *) surface->data;
+
+ if (!bspSurf->numTriangles || !bspSurf->numVerts)
+ continue;
+
numSortedSurfaces++;
}
@@ -1886,6 +1893,7 @@ static void R_CreateWorldVBOs(void)
j = 0;
for(surface = &s_worldData.surfaces[0]; surface < &s_worldData.surfaces[s_worldData.numsurfaces]; surface++)
{
+ srfBspSurface_t *bspSurf;
shader_t *shader = surface->shader;
if (shader->isPortal)
@@ -1897,44 +1905,42 @@ static void R_CreateWorldVBOs(void)
if (ShaderRequiresCPUDeforms(shader))
continue;
+ // check for this now so we can use srfBspSurface_t* universally in the rest of the function
if (!(*surface->data == SF_FACE || *surface->data == SF_GRID || *surface->data == SF_TRIANGLES))
continue;
+ bspSurf = (srfBspSurface_t *) surface->data;
+
+ if (!bspSurf->numTriangles || !bspSurf->numVerts)
+ continue;
+
surfacesSorted[j++] = surface;
}
qsort(surfacesSorted, numSortedSurfaces, sizeof(*surfacesSorted), BSPSurfaceCompare);
k = 0;
- for(firstSurf = lastSurf = currSurf = surfacesSorted; firstSurf < &surfacesSorted[numSortedSurfaces]; firstSurf = currSurf = lastSurf)
+ for(firstSurf = lastSurf = surfacesSorted; firstSurf < &surfacesSorted[numSortedSurfaces]; firstSurf = lastSurf)
{
int currVboSize, currIboSize;
+ // Find range of surfaces to merge by:
+ // - Collecting a number of surfaces which fit under maxVboSize/maxIboSize, or
+ // - All the surfaces with a single shader which go over maxVboSize/maxIboSize
currVboSize = currIboSize = 0;
while (currVboSize < maxVboSize && currIboSize < maxIboSize && lastSurf < &surfacesSorted[numSortedSurfaces])
{
int addVboSize, addIboSize, currShaderIndex;
addVboSize = addIboSize = 0;
- currShaderIndex = (*currSurf)->shader->sortedIndex;
- while(currSurf < &surfacesSorted[numSortedSurfaces] && (*currSurf)->shader->sortedIndex == currShaderIndex)
+ currShaderIndex = (*lastSurf)->shader->sortedIndex;
+
+ for(currSurf = lastSurf; currSurf < &surfacesSorted[numSortedSurfaces] && (*currSurf)->shader->sortedIndex == currShaderIndex; currSurf++)
{
srfBspSurface_t *bspSurf = (srfBspSurface_t *) (*currSurf)->data;
- switch (bspSurf->surfaceType)
- {
- case SF_FACE:
- case SF_GRID:
- case SF_TRIANGLES:
- addVboSize += bspSurf->numVerts * sizeof(srfVert_t);
- addIboSize += bspSurf->numTriangles * 3 *sizeof(glIndex_t);
- break;
-
- default:
- break;
- }
-
- currSurf++;
+ addVboSize += bspSurf->numVerts * sizeof(srfVert_t);
+ addIboSize += bspSurf->numTriangles * 3 * sizeof(glIndex_t);
}
if ((currVboSize != 0 && addVboSize + currVboSize > maxVboSize)
@@ -1947,6 +1953,7 @@ static void R_CreateWorldVBOs(void)
currIboSize += addIboSize;
}
+ // count verts/triangles/surfaces
numVerts = 0;
numTriangles = 0;
numSurfaces = 0;
@@ -1954,102 +1961,48 @@ static void R_CreateWorldVBOs(void)
{
srfBspSurface_t *bspSurf = (srfBspSurface_t *) (*currSurf)->data;
- switch (bspSurf->surfaceType)
- {
- case SF_FACE:
- case SF_GRID:
- case SF_TRIANGLES:
- numVerts += bspSurf->numVerts;
- numTriangles += bspSurf->numTriangles;
- numSurfaces++;
- break;
-
- default:
- break;
- }
+ numVerts += bspSurf->numVerts;
+ numTriangles += bspSurf->numTriangles;
+ numSurfaces++;
}
- if(!numVerts || !numTriangles)
- continue;
-
ri.Printf(PRINT_ALL, "...calculating world VBO %d ( %i verts %i tris )\n", k, numVerts, numTriangles);
// create arrays
verts = ri.Hunk_AllocateTempMemory(numVerts * sizeof(srfVert_t));
triangles = ri.Hunk_AllocateTempMemory(numTriangles * sizeof(srfTriangle_t));
- // set up triangle indices
+ // set up triangle indices and copy vertices
numVerts = 0;
numTriangles = 0;
for (currSurf = firstSurf; currSurf < lastSurf; currSurf++)
{
srfBspSurface_t *bspSurf = (srfBspSurface_t *) (*currSurf)->data;
+ srfTriangle_t *tri;
- switch (bspSurf->surfaceType)
- {
- case SF_FACE:
- case SF_GRID:
- case SF_TRIANGLES:
- bspSurf->firstIndex = numTriangles * 3;
-
- if(bspSurf->numTriangles)
- {
- srfTriangle_t *tri;
-
- bspSurf->minIndex = numVerts + bspSurf->triangles->indexes[0];
- bspSurf->maxIndex = numVerts + bspSurf->triangles->indexes[0];
-
- for(i = 0, tri = bspSurf->triangles; i < bspSurf->numTriangles; i++, tri++)
- {
- for(j = 0; j < 3; j++)
- {
- triangles[numTriangles + i].indexes[j] = numVerts + tri->indexes[j];
- bspSurf->minIndex = MIN(bspSurf->minIndex, numVerts + tri->indexes[j]);
- bspSurf->maxIndex = MAX(bspSurf->maxIndex, numVerts + tri->indexes[j]);
- }
- }
-
- numTriangles += bspSurf->numTriangles;
- }
-
- if(bspSurf->numVerts)
- numVerts += bspSurf->numVerts;
-
- break;
+ bspSurf->firstIndex = numTriangles * 3;
+ bspSurf->minIndex = numVerts + bspSurf->triangles->indexes[0];
+ bspSurf->maxIndex = numVerts + bspSurf->triangles->indexes[0];
- default:
- break;
+ for(i = 0, tri = bspSurf->triangles; i < bspSurf->numTriangles; i++, tri++)
+ {
+ for(j = 0; j < 3; j++)
+ {
+ triangles[numTriangles + i].indexes[j] = numVerts + tri->indexes[j];
+ bspSurf->minIndex = MIN(bspSurf->minIndex, numVerts + tri->indexes[j]);
+ bspSurf->maxIndex = MAX(bspSurf->maxIndex, numVerts + tri->indexes[j]);
+ }
}
- }
- // build vertices
- numVerts = 0;
- for (currSurf = firstSurf; currSurf < lastSurf; currSurf++)
- {
- srfBspSurface_t *bspSurf = (srfBspSurface_t *) (*currSurf)->data;
+ bspSurf->firstVert = numVerts;
- switch (bspSurf->surfaceType)
+ for(i = 0; i < bspSurf->numVerts; i++)
{
- case SF_FACE:
- case SF_GRID:
- case SF_TRIANGLES:
- bspSurf->firstVert = numVerts;
-
- if(bspSurf->numVerts)
- {
- for(i = 0; i < bspSurf->numVerts; i++)
- {
- CopyVert(&bspSurf->verts[i], &verts[numVerts + i]);
- }
-
- numVerts += bspSurf->numVerts;
- }
-
- break;
-
- default:
- break;
+ CopyVert(&bspSurf->verts[i], &verts[numVerts + i]);
}
+
+ numTriangles += bspSurf->numTriangles;
+ numVerts += bspSurf->numVerts;
}
#ifdef USE_VERT_TANGENT_SPACE
@@ -2069,29 +2022,14 @@ static void R_CreateWorldVBOs(void)
{
srfBspSurface_t *bspSurf = (srfBspSurface_t *) (*currSurf)->data;
- switch (bspSurf->surfaceType)
- {
- case SF_FACE:
- case SF_GRID:
- case SF_TRIANGLES:
- if( bspSurf->numVerts && bspSurf->numTriangles)
- {
- bspSurf->vbo = vbo;
- bspSurf->ibo = ibo;
- }
-
- break;
-
- default:
- break;
- }
+ bspSurf->vbo = vbo;
+ bspSurf->ibo = ibo;
}
ri.Hunk_FreeTempMemory(triangles);
ri.Hunk_FreeTempMemory(verts);
k++;
-
}
ri.Free(surfacesSorted);
@@ -3160,24 +3098,13 @@ void R_MergeLeafSurfaces(void)
surf1 = s_worldData.surfaces + i;
// retrieve vbo
- switch(*surf1->data)
- {
- case SF_FACE:
- case SF_GRID:
- case SF_TRIANGLES:
- vbo = ((srfBspSurface_t *)(surf1->data))->vbo;
- break;
-
- default:
- vbo = NULL;
- break;
- }
+ vbo = ((srfBspSurface_t *)(surf1->data))->vbo;
// count verts, indexes, and surfaces
numSurfsToMerge = 0;
numTriangles = 0;
numVerts = 0;
- for (j = 0; j < numWorldSurfaces; j++)
+ for (j = i; j < numWorldSurfaces; j++)
{
msurface_t *surf2;
srfBspSurface_t *bspSurf;
@@ -3188,19 +3115,8 @@ void R_MergeLeafSurfaces(void)
surf2 = s_worldData.surfaces + j;
bspSurf = (srfBspSurface_t *) surf2->data;
- switch(bspSurf->surfaceType)
- {
- case SF_FACE:
- case SF_GRID:
- case SF_TRIANGLES:
- numTriangles += bspSurf->numTriangles;
- numVerts += bspSurf->numVerts;
- break;
-
- default:
- break;
- }
-
+ numTriangles += bspSurf->numTriangles;
+ numVerts += bspSurf->numVerts;
numSurfsToMerge++;
}
@@ -3221,7 +3137,7 @@ void R_MergeLeafSurfaces(void)
// Merge surfaces (indexes) and calculate bounds
ClearBounds(bounds[0], bounds[1]);
firstIndex = numIboIndexes;
- for (j = 0; j < numWorldSurfaces; j++)
+ for (j = i; j < numWorldSurfaces; j++)
{
msurface_t *surf2;
srfBspSurface_t *bspSurf;
@@ -3235,24 +3151,14 @@ void R_MergeLeafSurfaces(void)
AddPointToBounds(surf2->cullinfo.bounds[1], bounds[0], bounds[1]);
bspSurf = (srfBspSurface_t *) surf2->data;
- switch(bspSurf->surfaceType)
+ for (k = 0; k < bspSurf->numTriangles; k++)
{
- case SF_FACE:
- case SF_GRID:
- case SF_TRIANGLES:
- for (k = 0; k < bspSurf->numTriangles; k++)
- {
- *outIboIndexes++ = bspSurf->triangles[k].indexes[0] + bspSurf->firstVert;
- *outIboIndexes++ = bspSurf->triangles[k].indexes[1] + bspSurf->firstVert;
- *outIboIndexes++ = bspSurf->triangles[k].indexes[2] + bspSurf->firstVert;
- numIboIndexes += 3;
- }
- break;
-
- // never happens, but silences a compile warning
- default:
- break;
+ *outIboIndexes++ = bspSurf->triangles[k].indexes[0] + bspSurf->firstVert;
+ *outIboIndexes++ = bspSurf->triangles[k].indexes[1] + bspSurf->firstVert;
+ *outIboIndexes++ = bspSurf->triangles[k].indexes[2] + bspSurf->firstVert;
+ numIboIndexes += 3;
}
+ break;
}
vboSurf = ri.Hunk_Alloc(sizeof(*vboSurf), h_low);
@@ -3269,7 +3175,7 @@ void R_MergeLeafSurfaces(void)
vboSurf->minIndex = *(iboIndexes + firstIndex);
vboSurf->maxIndex = *(iboIndexes + firstIndex);
- for (j = 1; j < numTriangles * 3; j++)
+ for (j = 0; j < numTriangles * 3; j++)
{
vboSurf->minIndex = MIN(vboSurf->minIndex, *(iboIndexes + firstIndex + j));
vboSurf->maxIndex = MAX(vboSurf->maxIndex, *(iboIndexes + firstIndex + j));
generated by cgit (git 2.34.1) at 2024-11-15 17:19:46 +0000