From d91f083ee44efb4534933be74d2d75f6b0038321 Mon Sep 17 00:00:00 2001 From: Sander van Dijk Date: Wed, 28 Nov 2012 19:10:52 +0000 Subject: [PATCH] Remove more dead code. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@790 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/gl_rmain.c | 1 - Quake/gl_vidsdl.c | 18 ------------------ Quake/glquake.h | 2 -- 3 files changed, 21 deletions(-) diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c index 1168eb66..9a498095 100644 --- a/Quake/gl_rmain.c +++ b/Quake/gl_rmain.c @@ -367,7 +367,6 @@ void R_Clear (void) clearbits = GL_DEPTH_BUFFER_BIT; if (gl_clear.value || isIntelVideo) clearbits |= GL_COLOR_BUFFER_BIT; //intel video workarounds from Baker - if (gl_stencilbits) clearbits |= GL_STENCIL_BUFFER_BIT; glClear (clearbits); } diff --git a/Quake/gl_vidsdl.c b/Quake/gl_vidsdl.c index 3ba18264..41401dac 100644 --- a/Quake/gl_vidsdl.c +++ b/Quake/gl_vidsdl.c @@ -46,10 +46,8 @@ typedef struct { int width; int height; int modenum; - int dib; int fullscreen; int bpp; -// int refreshrate; //johnfitz int halfscreen; char modedesc[17]; } vmode_t; @@ -84,7 +82,6 @@ static void VID_MenuKey (int key); static const char *VID_GetModeDescription (int mode); static void ClearAllStates (void); -static void VID_UpdateWindowStatus (void); static void GL_Init (void); static void GL_SetupState (void); //johnfitz @@ -99,7 +96,6 @@ qboolean gl_texture_env_add = false; //johnfitz qboolean gl_swap_control = false; //johnfitz qboolean gl_anisotropy_able = false; //johnfitz float gl_max_anisotropy; //johnfitz -int gl_stencilbits; //johnfitz PFNGLMULTITEXCOORD2FARBPROC GL_MTexCoord2fFunc = NULL; //johnfitz PFNGLACTIVETEXTUREARBPROC GL_SelectTextureFunc = NULL; //johnfitz @@ -273,8 +269,6 @@ static int VID_SetMode (int modenum) vid.numpages = 2; vid.type = modelist[modenum].type; - VID_UpdateWindowStatus (); - CDAudio_Resume (); BGM_Resume (); scr_disabled_for_loading = temp; @@ -442,15 +436,6 @@ static void VID_Unlock (void) VID_SyncCvars(); } -/* -================ -VID_UpdateWindowStatus -================ -*/ -static void VID_UpdateWindowStatus (void) -{ -} - //============================================================================== // // OPENGL STUFF @@ -979,7 +964,6 @@ static void VID_InitDIB (void) modelist[0].bpp); //johnfitz -- added bpp modelist[0].modenum = MODE_WINDOWED; - modelist[0].dib = 1; modelist[0].fullscreen = 0; modelist[0].halfscreen = 0; @@ -1026,7 +1010,6 @@ static void VID_InitFullDIB (void) modelist[nummodes].height = modes[j]->h; modelist[nummodes].modenum = 0; modelist[nummodes].halfscreen = 0; - modelist[nummodes].dib = 1; modelist[nummodes].fullscreen = 1; modelist[nummodes].bpp = bpps[i]; @@ -1188,7 +1171,6 @@ void VID_Init (void) modelist[nummodes].height = height; modelist[nummodes].modenum = 0; modelist[nummodes].halfscreen = 0; - modelist[nummodes].dib = 1; modelist[nummodes].fullscreen = 1; modelist[nummodes].bpp = bpp; sprintf (modelist[nummodes].modedesc, "%dx%dx%d", diff --git a/Quake/glquake.h b/Quake/glquake.h index 77a95230..bfa138d1 100644 --- a/Quake/glquake.h +++ b/Quake/glquake.h @@ -149,8 +149,6 @@ extern float load_subdivide_size; //johnfitz -- remember what subdivide_size val extern float r_world_matrix[16]; -extern int gl_stencilbits; //johnfitz - // Multitexture extern qboolean mtexenabled; extern qboolean gl_mtexable;