quick/Quake-III-Arena-VS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed SF_DISPLAY_LIST surface type.

Browse Source 
It was only a placeholder without implementation and was not used by the engine.
This commit is contained in:
Artem Kharytoniuk 2017-03-31 13:38:55 +03:00
parent 63c32ff8a6
commit c0ce8b4fe3
4 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/engine/platform/win_qgl.c
View File

@ -44,7 +44,6 @@ void ( APIENTRY * qglAlphaFunc )(GLenum func, GLclampf ref);
void ( APIENTRY * qglBegin )(GLenum mode);
void ( APIENTRY * qglBindTexture )(GLenum target, GLuint texture);
void ( APIENTRY * qglBlendFunc )(GLenum sfactor, GLenum dfactor);
void ( APIENTRY * qglCallList )(GLuint list);
void ( APIENTRY * qglClear )(GLbitfield mask);
void ( APIENTRY * qglClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
void ( APIENTRY * qglClearDepth )(GLclampd depth);
@ -105,7 +104,6 @@ static void ( APIENTRY * dllAlphaFunc )(GLenum func, GLclampf ref);
static void ( APIENTRY * dllBegin )(GLenum mode);
static void ( APIENTRY * dllBindTexture )(GLenum target, GLuint texture);
static void ( APIENTRY * dllBlendFunc )(GLenum sfactor, GLenum dfactor);
static void ( APIENTRY * dllCallList )(GLuint list);
static void ( APIENTRY * dllClear )(GLbitfield mask);
static void ( APIENTRY * dllClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
static void ( APIENTRY * dllClearDepth )(GLclampd depth);
@ -338,11 +336,6 @@ static void APIENTRY logBlendFunc(GLenum sfactor, GLenum dfactor)
fprintf( glw_state.log_fp, "glBlendFunc( %s, %s )\n", sf, df );
dllBlendFunc( sfactor, dfactor );
}
static void APIENTRY logCallList(GLuint list)
{
fprintf( glw_state.log_fp, "glCallList( %u )\n", list );
dllCallList( list );
}
static void APIENTRY logClear(GLbitfield mask)
{
fprintf( glw_state.log_fp, "glClear( 0x%x = ", mask );
@ -653,7 +646,6 @@ void QGL_Shutdown( void )
qglBegin = NULL;
qglBindTexture = NULL;
qglBlendFunc = NULL;
qglCallList = NULL;
qglClear = NULL;
qglClearColor = NULL;
qglClearDepth = NULL;
@ -747,7 +739,6 @@ qboolean QGL_Init( const char *dllname )
qglBegin = dllBegin = (decltype(dllBegin))GPA("glBegin");
qglBindTexture = dllBindTexture = (decltype(dllBindTexture))GPA("glBindTexture");
qglBlendFunc = dllBlendFunc = (decltype(dllBlendFunc))GPA("glBlendFunc");
qglCallList = dllCallList = (decltype(dllCallList))GPA("glCallList");
qglClear = dllClear = (decltype(dllClear))GPA("glClear");
qglClearColor = dllClearColor = (decltype(dllClearColor))GPA("glClearColor");
qglClearDepth = dllClearDepth = (decltype(dllClearDepth))GPA("glClearDepth");
@ -865,7 +856,6 @@ void QGL_EnableLogging( qboolean enable )
qglBegin = logBegin;
qglBindTexture = logBindTexture;
qglBlendFunc = logBlendFunc;
qglCallList = logCallList;
qglClear = logClear;
qglClearColor = logClearColor;
qglClearDepth = logClearDepth;
@ -932,7 +922,6 @@ void QGL_EnableLogging( qboolean enable )
qglBegin = dllBegin;
qglBindTexture = dllBindTexture;
qglBlendFunc = dllBlendFunc;
qglCallList = dllCallList;
qglClear = dllClear;
qglClearColor = dllClearColor;
qglClearDepth = dllClearDepth;

1
src/engine/renderer/qgl.h
View File

@ -64,7 +64,6 @@ extern void ( APIENTRY * qglAlphaFunc )(GLenum func, GLclampf ref);
extern void ( APIENTRY * qglBegin )(GLenum mode);
extern void ( APIENTRY * qglBindTexture )(GLenum target, GLuint texture);
extern void ( APIENTRY * qglBlendFunc )(GLenum sfactor, GLenum dfactor);
extern void ( APIENTRY * qglCallList )(GLuint list);
extern void ( APIENTRY * qglClear )(GLbitfield mask);
extern void ( APIENTRY * qglClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
extern void ( APIENTRY * qglClearDepth )(GLclampd depth);

7
src/engine/renderer/tr_local.h
View File

@ -534,7 +534,6 @@ typedef enum {
SF_MD4,
SF_FLARE,
SF_ENTITY, // beams, rails, lightning, etc that can be determined by entity
SF_DISPLAY_LIST,
SF_NUM_SURFACE_TYPES,
SF_MAX = 0x7fffffff // ensures that sizeof( surfaceType_t ) == sizeof( int )
@ -560,12 +559,6 @@ typedef struct srfPoly_s {
polyVert_t *verts;
} srfPoly_t;
typedef struct srfDisplayList_s {
surfaceType_t surfaceType;
int listNum;
} srfDisplayList_t;
typedef struct srfFlare_s {
surfaceType_t surfaceType;
vec3_t origin;

9
src/engine/renderer/tr_surface.c
View File

@ -1188,14 +1188,6 @@ void RB_SurfaceFlare( srfFlare_t *surf ) {
#endif
void RB_SurfaceDisplayList( srfDisplayList_t *surf ) {
// all apropriate state must be set in RB_BeginSurface
// this isn't implemented yet...
qglCallList( surf->listNum );
}
void RB_SurfaceSkip( void *surf ) {
}
@ -1211,5 +1203,4 @@ void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
(void(*)(void*))RB_SurfaceAnim, // SF_MD4,
(void(*)(void*))RB_SurfaceFlare, // SF_FLARE,
(void(*)(void*))RB_SurfaceEntity, // SF_ENTITY
(void(*)(void*))RB_SurfaceDisplayList // SF_DISPLAY_LIST
};