ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-11-12 23:44:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unfinished OpenGL display list code

Browse source 
It seems unlikely anyone is going to do anything with this aside from stub
it out in OpenGLES ports.
This commit is contained in:
Zack Middleton 2014-11-16 11:58:52 -06:00
parent 22bcda018b
commit 60d28722ef
4 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/renderergl1/tr_local.h
View file

@ -477,7 +477,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_DISPLAY_LIST,
SF_NUM_SURFACE_TYPES, SF_NUM_SURFACE_TYPES,
SF_MAX = 0x7fffffff // ensures that sizeof( surfaceType_t ) == sizeof( int ) SF_MAX = 0x7fffffff // ensures that sizeof( surfaceType_t ) == sizeof( int )
@ -503,11 +502,6 @@ typedef struct srfPoly_s {
polyVert_t *verts; polyVert_t *verts;
} srfPoly_t; } srfPoly_t;
typedef struct srfDisplayList_s {
surfaceType_t surfaceType;
int listNum;
} srfDisplayList_t;
typedef struct srfFlare_s { typedef struct srfFlare_s {
surfaceType_t surfaceType; surfaceType_t surfaceType;

9
code/renderergl1/tr_surface.c
View file

@ -1218,12 +1218,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_SurfaceDisplayList( srfDisplayList_t *surf ) {
// all apropriate state must be set in RB_BeginSurface
// this isn't implemented yet...
qglCallList( surf->listNum );
}
static void RB_SurfaceSkip( void *surf ) { static void RB_SurfaceSkip( void *surf ) {
} }
@ -1239,6 +1233,5 @@ void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
(void(*)(void*))RB_MDRSurfaceAnim, // SF_MDR, (void(*)(void*))RB_MDRSurfaceAnim, // SF_MDR,
(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_SurfaceDisplayList // SF_DISPLAY_LIST
}; };

6
code/renderergl2/tr_local.h
View file

@ -848,7 +848,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_DISPLAY_LIST,
SF_VAO_MESH, SF_VAO_MESH,
SF_VAO_MDVMESH, SF_VAO_MDVMESH,
@ -877,11 +876,6 @@ typedef struct srfPoly_s {
polyVert_t *verts; polyVert_t *verts;
} srfPoly_t; } srfPoly_t;
typedef struct srfDisplayList_s {
surfaceType_t surfaceType;
int listNum;
} srfDisplayList_t;
typedef struct srfFlare_s { typedef struct srfFlare_s {
surfaceType_t surfaceType; surfaceType_t surfaceType;

7
code/renderergl2/tr_surface.c
View file

@ -1658,12 +1658,6 @@ void RB_SurfaceVaoMdvMesh(srfVaoMdvMesh_t * surface)
glState.vertexAnimation = qfalse; glState.vertexAnimation = qfalse;
} }
static void RB_SurfaceDisplayList( srfDisplayList_t *surf ) {
// all apropriate state must be set in RB_BeginSurface
// this isn't implemented yet...
qglCallList( surf->listNum );
}
static void RB_SurfaceSkip( void *surf ) { static void RB_SurfaceSkip( void *surf ) {
} }
@ -1680,7 +1674,6 @@ 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_SurfaceDisplayList, // SF_DISPLAY_LIST
(void(*)(void*))RB_SurfaceVaoMesh, // SF_VAO_MESH, (void(*)(void*))RB_SurfaceVaoMesh, // SF_VAO_MESH,
(void(*)(void*))RB_SurfaceVaoMdvMesh, // SF_VAO_MDVMESH (void(*)(void*))RB_SurfaceVaoMdvMesh, // SF_VAO_MDVMESH
}; };