[iortcw] 25/89: All: Rend2: Remove SF_VAO_MESH
Simon McVittie
smcv at debian.org
Fri Sep 8 10:44:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to tag 1.51b
in repository iortcw.
commit 2d0e3445662f38575b4741a3f606f9e21751dbdd
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date: Fri Jun 16 20:43:38 2017 -0400
All: Rend2: Remove SF_VAO_MESH
---
MP/code/rend2/tr_light.c | 1 -
MP/code/rend2/tr_local.h | 10 +---------
MP/code/rend2/tr_surface.c | 36 ------------------------------------
MP/code/rend2/tr_world.c | 2 --
SP/code/rend2/tr_light.c | 1 -
SP/code/rend2/tr_local.h | 10 +---------
SP/code/rend2/tr_surface.c | 36 ------------------------------------
SP/code/rend2/tr_world.c | 2 --
8 files changed, 2 insertions(+), 96 deletions(-)
diff --git a/MP/code/rend2/tr_light.c b/MP/code/rend2/tr_light.c
index 081d724..8d350ba 100644
--- a/MP/code/rend2/tr_light.c
+++ b/MP/code/rend2/tr_light.c
@@ -114,7 +114,6 @@ void R_DlightBmodel( bmodel_t *bmodel ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
- case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->dlightBits = mask;
break;
diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index f1e0eb1..941849e 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -961,7 +961,6 @@ typedef enum {
SF_IQM,
SF_FLARE,
SF_ENTITY, // beams, rails, lightning, etc that can be determined by entity
- SF_VAO_MESH,
SF_VAO_MDVMESH,
SF_NUM_SURFACE_TYPES,
@@ -1015,7 +1014,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}}
-// 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
{
surfaceType_t surfaceType;
@@ -1038,13 +1037,6 @@ typedef struct srfBspSurface_s
int numVerts;
srfVert_t *verts;
- // BSP VBO offsets
- int firstVert;
- int firstIndex;
-
- // static render data
- vao_t *vao;
-
// SF_GRID specific variables after here
// lod information, which may be different
diff --git a/MP/code/rend2/tr_surface.c b/MP/code/rend2/tr_surface.c
index 7b79e27..02b455e 100644
--- a/MP/code/rend2/tr_surface.c
+++ b/MP/code/rend2/tr_surface.c
@@ -479,35 +479,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
@@ -1270,12 +1241,6 @@ static void RB_SurfaceFlare( srfFlare_t *surf ) {
RB_AddFlare(surf, tess.fogNum, surf->origin, surf->color, 1.0f, surf->normal, 0, qtrue);
}
-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)
{
//mdvModel_t *mdvModel;
@@ -1383,6 +1348,5 @@ void( *rb_surfaceTable[SF_NUM_SURFACE_TYPES] ) ( void * ) = {
( void( * ) ( void* ) )RB_IQMSurfaceAnim, // SF_IQM,
( void( * ) ( void* ) )RB_SurfaceFlare, // SF_FLARE,
( void( * ) ( void* ) )RB_SurfaceEntity, // SF_ENTITY
- ( void( * ) ( void* ) )RB_SurfaceVaoMesh, // SF_VAO_MESH,
( void( * ) ( void* ) )RB_SurfaceVaoMdvMesh, // SF_VAO_MDVMESH
};
diff --git a/MP/code/rend2/tr_world.c b/MP/code/rend2/tr_world.c
index 43ba9ff..6ac604c 100644
--- a/MP/code/rend2/tr_world.c
+++ b/MP/code/rend2/tr_world.c
@@ -219,7 +219,6 @@ static int R_DlightSurface( msurface_t *surf, int dlightBits ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
- case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->dlightBits = dlightBits;
break;
@@ -305,7 +304,6 @@ static int R_PshadowSurface( msurface_t *surf, int pshadowBits ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
- case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->pshadowBits = pshadowBits;
break;
diff --git a/SP/code/rend2/tr_light.c b/SP/code/rend2/tr_light.c
index 35c0fe7..98974b4 100644
--- a/SP/code/rend2/tr_light.c
+++ b/SP/code/rend2/tr_light.c
@@ -114,7 +114,6 @@ void R_DlightBmodel( bmodel_t *bmodel ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
- case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->dlightBits = mask;
break;
diff --git a/SP/code/rend2/tr_local.h b/SP/code/rend2/tr_local.h
index 62deec7..0fc8715 100644
--- a/SP/code/rend2/tr_local.h
+++ b/SP/code/rend2/tr_local.h
@@ -967,7 +967,6 @@ typedef enum {
SF_IQM,
SF_FLARE,
SF_ENTITY, // beams, rails, lightning, etc that can be determined by entity
- SF_VAO_MESH,
SF_VAO_MDVMESH,
SF_NUM_SURFACE_TYPES,
@@ -1021,7 +1020,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}}
-// 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
{
surfaceType_t surfaceType;
@@ -1044,13 +1043,6 @@ typedef struct srfBspSurface_s
int numVerts;
srfVert_t *verts;
- // BSP VBO offsets
- int firstVert;
- int firstIndex;
-
- // static render data
- vao_t *vao;
-
// SF_GRID specific variables after here
// lod information, which may be different
diff --git a/SP/code/rend2/tr_surface.c b/SP/code/rend2/tr_surface.c
index 0bb8c77..771bb76 100644
--- a/SP/code/rend2/tr_surface.c
+++ b/SP/code/rend2/tr_surface.c
@@ -479,35 +479,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
@@ -1268,12 +1239,6 @@ static void RB_SurfaceFlare( srfFlare_t *surf ) {
RB_AddFlare(surf, tess.fogNum, surf->origin, surf->color, 1.0f, surf->normal, 0, qtrue);
}
-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)
{
//mdvModel_t *mdvModel;
@@ -1381,6 +1346,5 @@ void( *rb_surfaceTable[SF_NUM_SURFACE_TYPES] ) ( void * ) = {
( void( * ) ( void* ) )RB_IQMSurfaceAnim, // SF_IQM,
( void( * ) ( void* ) )RB_SurfaceFlare, // SF_FLARE,
( void( * ) ( void* ) )RB_SurfaceEntity, // SF_ENTITY
- ( void( * ) ( void* ) )RB_SurfaceVaoMesh, // SF_VAO_MESH,
( void( * ) ( void* ) )RB_SurfaceVaoMdvMesh, // SF_VAO_MDVMESH
};
diff --git a/SP/code/rend2/tr_world.c b/SP/code/rend2/tr_world.c
index dc6190a..d4fa9bf 100644
--- a/SP/code/rend2/tr_world.c
+++ b/SP/code/rend2/tr_world.c
@@ -219,7 +219,6 @@ static int R_DlightSurface( msurface_t *surf, int dlightBits ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
- case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->dlightBits = dlightBits;
break;
@@ -305,7 +304,6 @@ static int R_PshadowSurface( msurface_t *surf, int pshadowBits ) {
case SF_FACE:
case SF_GRID:
case SF_TRIANGLES:
- case SF_VAO_MESH:
((srfBspSurface_t *)surf->data)->pshadowBits = pshadowBits;
break;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list