From c0ce8b4fe38a7e008411596970bd8574c2e144b6 Mon Sep 17 00:00:00 2001 From: Artem Kharytoniuk Date: Fri, 31 Mar 2017 13:38:55 +0300 Subject: [PATCH] Removed SF_DISPLAY_LIST surface type. It was only a placeholder without implementation and was not used by the engine. --- src/engine/platform/win_qgl.c | 11 ----------- src/engine/renderer/qgl.h | 1 - src/engine/renderer/tr_local.h | 7 ------- src/engine/renderer/tr_surface.c | 9 --------- 4 files changed, 28 deletions(-) diff --git a/src/engine/platform/win_qgl.c b/src/engine/platform/win_qgl.c index e0863a0..3199280 100644 --- a/src/engine/platform/win_qgl.c +++ b/src/engine/platform/win_qgl.c @@ -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; diff --git a/src/engine/renderer/qgl.h b/src/engine/renderer/qgl.h index d0c25c8..1319394 100644 --- a/src/engine/renderer/qgl.h +++ b/src/engine/renderer/qgl.h @@ -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); diff --git a/src/engine/renderer/tr_local.h b/src/engine/renderer/tr_local.h index 42cc31b..af9d178 100644 --- a/src/engine/renderer/tr_local.h +++ b/src/engine/renderer/tr_local.h @@ -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; diff --git a/src/engine/renderer/tr_surface.c b/src/engine/renderer/tr_surface.c index e3f0051..7b4f9eb 100644 --- a/src/engine/renderer/tr_surface.c +++ b/src/engine/renderer/tr_surface.c @@ -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 };