[renderer] Clean up a pile of dead screen declarations

The declarations were either unused, or the functions empty stubs for
all renderers.

include/QF/screen.h

@@ -29,8 +29,6 @@
 #ifndef __QF_screen_h
 #define __QF_screen_h
 
-#include "QF/qtypes.h"
-
 struct transform_s;
 
 void SCR_Init (void);
@@ -40,17 +38,6 @@ typedef void (*SCR_Func)(void);
 void SCR_UpdateScreen (struct transform_s *camera, double realtime,
 					   SCR_Func *scr_funcs);
 
-int MipColor (int r, int g, int b);
-
-extern int			sb_lines;
-
-extern qboolean		scr_skipupdate;
-
-extern struct cvar_s		*scr_fov;
-extern struct cvar_s		*scr_viewsize;
-
-// only the refresh window will be updated unless these variables are flagged
-
 extern struct cvar_s *hud_fps, *hud_time;
 
 #endif//__QF_screen_h

include/r_screen.h

@@ -31,42 +31,17 @@
 #ifndef __r_screen_h
 #define __r_screen_h
 
-#include "QF/screen.h"
-#include "QF/vid.h"
-
 void SCR_DrawRam (void);
-void SCR_DrawFPS (void);
-void SCR_DrawTime (void);
 void SCR_DrawTurtle (void);
 void SCR_DrawPause (void);
 struct tex_s *SCR_CaptureBGR (void);
 struct tex_s *SCR_ScreenShot (unsigned width, unsigned height);
 void SCR_DrawStringToSnap (const char *s, struct tex_s *tex, int x, int y);
-
+void SCR_SetFOV (float fov);
+void SCR_ScreenShot_f (void);
+int MipColor (int r, int g, int b);
 
 extern int         scr_copytop;
-
-extern float       scr_con_current;
-extern float       scr_conlines;				// lines of console to display
-
-extern int         oldscreensize;
-extern int         oldsbar;
-
-extern qboolean    scr_initialized;			// ready to draw
-
-extern struct qpic_s *scr_ram;
-extern struct qpic_s *scr_net;
-extern struct qpic_s *scr_turtle;
-
-extern int         clearconsole;
-extern int         clearnotify;
-
-extern vrect_t    *pconupdate;
-
 extern qboolean    scr_skipupdate;
 
-void SCR_SetFOV (float fov);
-void SCR_SetUpToDrawConsole (void);
-void SCR_ScreenShot_f (void);
-
 #endif//__r_screen_h

libs/video/renderer/gl/gl_screen.c

@@ -230,7 +230,6 @@ gl_R_RenderFrame (SCR_Func *scr_funcs)
 	// do 3D refresh drawing, and then update the screen
 	gl_R_RenderView ();
 
-	SCR_SetUpToDrawConsole ();
 	GL_Set2D ();
 	GL_DrawReset ();
 

libs/video/renderer/glsl/glsl_screen.c

@@ -180,7 +180,6 @@ glsl_R_RenderFrame (SCR_Func *scr_funcs)
 
 	glsl_R_RenderView ();
 
-	SCR_SetUpToDrawConsole ();
 	GLSL_Set2D ();
 	GLSL_DrawReset ();
 	SCR_TileClear ();

libs/video/renderer/r_screen.c

@@ -51,65 +51,15 @@
 #include "r_internal.h"
 #include "sbar.h"
 
-/*
-	background clear
-	rendering
-	turtle/net/ram icons
-	sbar
-	centerprint / slow centerprint
-	notify lines
-	intermission / finale overlay
-	loading plaque
-	console
-	menu
-
-	required background clears
-	required update regions
-
-	syncronous draw mode or async
-	One off screen buffer, with updates either copied or xblited
-	Need to double buffer?
-
-	async draw will require the refresh area to be cleared, because it will be
-	xblited, but sync draw can just ignore it.
-
-	sync
-	draw
-
-	CenterPrint ()
-	SlowPrint ()
-	Screen_Update ();
-	Sys_Printf ();
-
-	net
-	turn off messages option
-
-	the refresh is always rendered, unless the console is full screen
-
-	console is:
-		notify lines
-		half
-		full
-*/
-
 // only the refresh window will be updated unless these variables are flagged
 int         scr_copytop;
-byte       *draw_chars;					// 8*8 graphic characters FIXME location
-
-int         oldsbar;
-
+byte       *draw_chars;			// 8*8 graphic characters FIXME location
 qboolean    r_cache_thrash;		// set if surface cache is thrashing
 
-qboolean    scr_initialized;			// ready to draw
-
-qpic_t     *scr_ram;
-qpic_t     *scr_turtle;
-
-int         clearconsole;
-
-vrect_t    *pconupdate;
-
 qboolean    scr_skipupdate;
+static qboolean scr_initialized;// ready to draw
+static qpic_t *scr_ram;
+static qpic_t *scr_turtle;
 
 void
 R_SetVrect (const vrect_t *vrectin, vrect_t *vrect, int lineadj)
@@ -318,11 +268,6 @@ SCR_DrawPause (void)
 					   pic);
 }
 
-void
-SCR_SetUpToDrawConsole (void)
-{
-}
-
 /*
 	Find closest color in the palette for named color
 */

libs/video/renderer/sw/screen.c

@@ -195,10 +195,6 @@ R_RenderFrame (SCR_Func *scr_funcs)
 		Draw_TileClear (0, 0, vid.width, vid.height);
 	}
 
-	pconupdate = NULL;
-
-	SCR_SetUpToDrawConsole ();
-
 	D_DisableBackBufferAccess ();		// for adapters that can't stay mapped
 										// in for linear writes all the time
 	VID_LockBuffer ();
@@ -216,10 +212,6 @@ R_RenderFrame (SCR_Func *scr_funcs)
 
 	D_DisableBackBufferAccess ();		// for adapters that can't stay mapped
 										// in for linear writes all the time
-	if (pconupdate) {
-		D_UpdateRects (pconupdate);
-	}
-
 	// update one of three areas
 	if (vr_data.scr_copyeverything) {
 		vrect.x = 0;

libs/video/renderer/sw32/screen.c

@@ -152,10 +152,6 @@ sw32_R_RenderFrame (SCR_Func *scr_funcs)
 		sw32_Draw_TileClear (0, 0, vid.width, vid.height);
 	}
 
-	pconupdate = NULL;
-
-	SCR_SetUpToDrawConsole ();
-
 	sw32_D_DisableBackBufferAccess ();		// for adapters that can't stay mapped
 										// in for linear writes all the time
 	VID_LockBuffer ();
@@ -173,10 +169,6 @@ sw32_R_RenderFrame (SCR_Func *scr_funcs)
 
 	sw32_D_DisableBackBufferAccess ();		// for adapters that can't stay mapped
 										// in for linear writes all the time
-	if (pconupdate) {
-		sw32_D_UpdateRects (pconupdate);
-	}
-
 	// update one of three areas
 	if (vr_data.scr_copyeverything) {
 		vrect.x = 0;

qw/source/cl_screen.c

@@ -112,7 +112,6 @@ static SCR_Func scr_funcs_normal[] = {
 	0, //SCR_DrawRam,
 	0, //SCR_DrawTurtle,
 	0, //SCR_DrawPause,
-	//CL_NetGraph,FIXME
 	Sbar_Draw,
 	SCR_CShift,
 	scr_draw_views,