teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-10 23:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

OpenGL2: Remove SF_VAO_MESH.

Browse source
This commit is contained in:
SmileTheory 2017-06-16 16:52:53 -07:00
parent fd3b58b967
commit e03cdf444c
4 changed files with 1 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/renderergl2/tr_light.c
View file

@ -99,7 +99,6 @@ void R_DlightBmodel( bmodel_t *bmodel ) {
case SF_FACE: case SF_FACE:
case SF_GRID: case SF_GRID:
case SF_TRIANGLES: case SF_TRIANGLES:
case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->dlightBits = mask; ((srfBspSurface_t *)surf->data)->dlightBits = mask;
break; break;

10
code/renderergl2/tr_local.h
View file

@ -850,7 +850,6 @@ typedef enum {
SF_IQM, SF_IQM,
SF_FLARE, SF_FLARE,
SF_ENTITY, // beams, rails, lightning, etc that can be determined by entity SF_ENTITY, // beams, rails, lightning, etc that can be determined by entity
SF_VAO_MESH,
SF_VAO_MDVMESH, SF_VAO_MDVMESH,
SF_NUM_SURFACE_TYPES, SF_NUM_SURFACE_TYPES,
@ -903,7 +902,7 @@ typedef struct
#define srfVert_t_cleared(x) srfVert_t (x) = {{0, 0, 0}, {0, 0}, {0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}} #define srfVert_t_cleared(x) srfVert_t (x) = {{0, 0, 0}, {0, 0}, {0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}
// srfBspSurface_t covers SF_GRID, SF_TRIANGLES, SF_POLY, and SF_VAO_MESH // srfBspSurface_t covers SF_GRID, SF_TRIANGLES, and SF_POLY
typedef struct srfBspSurface_s typedef struct srfBspSurface_s
{ {
surfaceType_t surfaceType; surfaceType_t surfaceType;
@ -926,13 +925,6 @@ typedef struct srfBspSurface_s
int numVerts; int numVerts;
srfVert_t *verts; srfVert_t *verts;
// BSP VBO offsets
int firstVert;
int firstIndex;
// static render data
vao_t *vao;
// SF_GRID specific variables after here // SF_GRID specific variables after here
// lod information, which may be different // lod information, which may be different

36
code/renderergl2/tr_surface.c
View file

@ -451,35 +451,6 @@ static qboolean RB_SurfaceVaoCached(int numVerts, srfVert_t *verts, int numIndex
} }
static qboolean RB_SurfaceVao(vao_t *vao, int numVerts, int numIndexes, int firstIndex, int dlightBits, int pshadowBits, qboolean shaderCheck)
{
if (!vao)
{
return qfalse;
}
if (shaderCheck && !(!ShaderRequiresCPUDeforms(tess.shader) && !tess.shader->isSky && !tess.shader->isPortal))
{
return qfalse;
}
RB_CheckVao(vao);
tess.dlightBits |= dlightBits;
tess.pshadowBits |= pshadowBits;
RB_EndSurface();
RB_BeginSurface(tess.shader, tess.fogNum, tess.cubemapIndex);
backEnd.pc.c_staticVaoDraws++;
tess.numIndexes = numIndexes;
tess.numVertexes = numVerts;
return qtrue;
}
/* /*
============= =============
RB_SurfaceTriangles RB_SurfaceTriangles
@ -1236,12 +1207,6 @@ static void RB_SurfaceFlare(srfFlare_t *surf)
RB_AddFlare(surf, tess.fogNum, surf->origin, surf->color, surf->normal); RB_AddFlare(surf, tess.fogNum, surf->origin, surf->color, surf->normal);
} }
static void RB_SurfaceVaoMesh(srfBspSurface_t * srf)
{
RB_SurfaceVao (srf->vao, srf->numVerts, srf->numIndexes, srf->firstIndex,
srf->dlightBits, srf->pshadowBits, qfalse );
}
void RB_SurfaceVaoMdvMesh(srfVaoMdvMesh_t * surface) void RB_SurfaceVaoMdvMesh(srfVaoMdvMesh_t * surface)
{ {
//mdvModel_t *mdvModel; //mdvModel_t *mdvModel;
@ -1348,6 +1313,5 @@ void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
(void(*)(void*))RB_IQMSurfaceAnim, // SF_IQM, (void(*)(void*))RB_IQMSurfaceAnim, // SF_IQM,
(void(*)(void*))RB_SurfaceFlare, // SF_FLARE, (void(*)(void*))RB_SurfaceFlare, // SF_FLARE,
(void(*)(void*))RB_SurfaceEntity, // SF_ENTITY (void(*)(void*))RB_SurfaceEntity, // SF_ENTITY
(void(*)(void*))RB_SurfaceVaoMesh, // SF_VAO_MESH,
(void(*)(void*))RB_SurfaceVaoMdvMesh, // SF_VAO_MDVMESH (void(*)(void*))RB_SurfaceVaoMdvMesh, // SF_VAO_MDVMESH
}; };

2
code/renderergl2/tr_world.c
View file

@ -213,7 +213,6 @@ static int R_DlightSurface( msurface_t *surf, int dlightBits ) {
case SF_FACE: case SF_FACE:
case SF_GRID: case SF_GRID:
case SF_TRIANGLES: case SF_TRIANGLES:
case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->dlightBits = dlightBits; ((srfBspSurface_t *)surf->data)->dlightBits = dlightBits;
break; break;
@ -299,7 +298,6 @@ static int R_PshadowSurface( msurface_t *surf, int pshadowBits ) {
case SF_FACE: case SF_FACE:
case SF_GRID: case SF_GRID:
case SF_TRIANGLES: case SF_TRIANGLES:
case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->pshadowBits = pshadowBits; ((srfBspSurface_t *)surf->data)->pshadowBits = pshadowBits;
break; break;