Split out and partially implement the screen code.

libs/video/renderer/glsl/Makefile.am

@@ -20,7 +20,7 @@ SUFFICES=.frag .vert .fc .vc
 	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
 
 glsl_src = \
-	glsl_draw.c glsl_main.c glsl_particles.c
+	glsl_draw.c glsl_main.c glsl_particles.c glsl_screen.c
 
 libglsl_la_SOURCES= $(glsl_src)
 

libs/video/renderer/glsl/glsl_draw.c

@@ -207,7 +207,22 @@ Draw_FadeScreen (void)
 }
 
 void
-GL_FlushText (void)
+GL_Set2D (void)
+{
+}
+
+void
+GL_Set2DScaled (void)
+{
+}
+
+void
+GL_DrawReset (void)
 {
 	char_queue->size = 0;
 }
+
+void
+GL_FlushText (void)
+{
+}

libs/video/renderer/glsl/glsl_main.c

@@ -83,12 +83,6 @@ R_Init (void)
 	R_InitParticles ();
 }
 
-VISIBLE void
-SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs)
-{
-	GL_FlushText ();
-}
-
 VISIBLE void
 R_NewMap (model_t *worldmodel, struct model_s **models, int num_models)
 {
@@ -150,17 +144,6 @@ R_LineGraph (int x, int y, int *h_vals, int count)
 {
 }
 
-VISIBLE tex_t *
-SCR_ScreenShot (int width, int height)
-{
-	return 0;
-}
-
-VISIBLE void
-SCR_ScreenShot_f (void)
-{
-}
-
 VISIBLE int
 GL_LoadTexture (const char *identifier, int width, int height, byte *data,
 				qboolean mipmap, qboolean alpha, int bytesperpixel)

libs/video/renderer/glsl/glsl_screen.c

@@ -0,0 +1,138 @@
+/*
+	glsl_main.c
+
+	GLSL rendering
+
+	Copyright (C) 2011 Bill Currie <bill@taniwha.org>
+
+	Author: Bill Currie <bill@taniwha.org>
+	Date: 2011/12/23
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+static __attribute__ ((used)) const char rcsid[] = "$Id$";
+
+#ifdef HAVE_STRING_H
+# include "string.h"
+#endif
+#ifdef HAVE_STRINGS_H
+# include "strings.h"
+#endif
+
+#include "QF/cvar.h"
+#include "QF/draw.h"
+#include "QF/image.h"
+#include "QF/render.h"
+#include "QF/screen.h"
+#include "QF/skin.h"
+
+#include "QF/GL/defines.h"
+#include "QF/GL/funcs.h"
+#include "QF/GL/qf_rmain.h"
+#include "QF/GL/qf_textures.h"
+#include "QF/GL/qf_vid.h"
+
+#include "clview.h"//FIXME
+#include "gl_draw.h"
+#include "r_cvar.h"
+#include "r_dynamic.h"
+#include "r_screen.h"
+#include "r_shared.h"
+
+static void
+SCR_TileClear (void)
+{
+	if (r_refdef.vrect.x > 0) {
+		// left
+		Draw_TileClear (0, 0, r_refdef.vrect.x, vid.height - r_lineadj);
+		// right
+		Draw_TileClear (r_refdef.vrect.x + r_refdef.vrect.width, 0,
+						vid.width - r_refdef.vrect.x + r_refdef.vrect.width,
+						vid.height - r_lineadj);
+	}
+	if (r_refdef.vrect.y > 0) {
+		// top
+		Draw_TileClear (r_refdef.vrect.x, 0,
+						r_refdef.vrect.x + r_refdef.vrect.width,
+						r_refdef.vrect.y);
+		// bottom
+		Draw_TileClear (r_refdef.vrect.x,
+						r_refdef.vrect.y + r_refdef.vrect.height,
+						r_refdef.vrect.width,
+						vid.height - r_lineadj -
+						(r_refdef.vrect.height + r_refdef.vrect.y));
+	}
+}
+
+VISIBLE void
+SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs)
+{
+	static int  begun = 0;
+
+	if (begun) {
+		begun = 0;
+		GL_EndRendering ();
+	}
+
+	r_realtime = realtime;
+	vid.numpages = 2 + gl_triplebuffer->int_val;
+
+	if (!scr_initialized)
+		return;
+
+	begun = 1;
+
+	if (oldfov != scr_fov->value) {
+		oldfov = scr_fov->value;
+		vid.recalc_refdef = true;
+	}
+	if (vid.recalc_refdef)
+		SCR_CalcRefdef ();
+
+	V_RenderView ();	// FIXME (scr_3dfuncs?)
+
+	SCR_SetUpToDrawConsole ();
+	if (!r_worldentity.model)
+		GL_Set2D ();
+	GL_DrawReset ();
+	SCR_TileClear ();
+	GL_Set2DScaled ();
+	while (*scr_funcs) {
+		(*scr_funcs)();
+		scr_funcs++;
+	}
+	GL_FlushText ();
+	qfglFlush ();
+}
+
+VISIBLE tex_t *
+SCR_ScreenShot (int width, int height)
+{
+	return 0;
+}
+
+VISIBLE void
+SCR_ScreenShot_f (void)
+{
+}