From 31ab61b06b96c0f5b6baec8c135adb9689efde74 Mon Sep 17 00:00:00 2001
From: Mark Olsen <isthisinuse@users.sourceforge.net>
Date: Wed, 26 Sep 2007 15:08:42 +0000
Subject: [PATCH] Updated.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2694 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/sw/vid_fodquake.c | 74 +++++++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 23 deletions(-)

diff --git a/engine/sw/vid_fodquake.c b/engine/sw/vid_fodquake.c
index 5053371bb..5f0300c37 100644
--- a/engine/sw/vid_fodquake.c
+++ b/engine/sw/vid_fodquake.c
@@ -61,6 +61,9 @@ static void Fod_Cvar_Register(cvar_t *cvar)
 #define Com_Printf Con_Printf
 #define Q_Malloc Z_Malloc
 
+/* And some funny prototypes. Just because. */
+void Sys_Video_SetPalette(void *display, unsigned char *palette);
+
 #include "fod/vid_x11.c"
 #include "fod/in_x11.c"
 
@@ -80,41 +83,61 @@ static void *fod_display;
 static int fod_width;
 static int fod_height;
 
+static void *vid_surfcache;
+
 qboolean SWVID_Init(rendererstate_t *info, unsigned char *palette)
 {
-	fod_display = Sys_Video_Open(info->width, info->height, info->bpp, info->fullscreen, vid_curpal);
-	if (fod_display)
+	unsigned int surfcachesize;
+
+	surfcachesize = D_SurfaceCacheForRes(vid.width, vid.height, 0);
+	
+	d_pzbuffer = malloc(info->width * info->height * sizeof(*d_pzbuffer));
+	if (d_pzbuffer)
 	{
-		fod_width = info->width;
-		fod_height = info->height;
+		vid_surfcache = malloc(surfcachesize);
+		if (vid_surfcache)
+		{
+			D_InitCaches(vid_surfcache, surfcachesize);
 
-		vid.width = info->width;
-		vid.height = info->height;
+			fod_display = Sys_Video_Open(info->width, info->height, info->bpp, info->fullscreen, vid_curpal);
+			if (fod_display)
+			{
+				fod_width = info->width;
+				fod_height = info->height;
 
-		vid.maxwarpwidth = WARP_WIDTH;
-		vid.maxwarpheight = WARP_HEIGHT;
+				vid.width = info->width;
+				vid.height = info->height;
 
-		vid.numpages = Sys_Video_GetNumBuffers(fod_display);
-		vid.rowbytes = Sys_Video_GetBytesPerRow(fod_display);
-		vid.buffer = Sys_Video_GetBuffer(fod_display);
-		vid.colormap = host_colormap;
-		vid.direct = 0;
-		vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0);
+				vid.maxwarpwidth = WARP_WIDTH;
+				vid.maxwarpheight = WARP_HEIGHT;
 
-		vid.conbuffer = vid.buffer;
-		vid.conrowbytes = vid.rowbytes;
-		vid.conwidth = vid.width;
-		vid.conheight = vid.height;
+				vid.numpages = Sys_Video_GetNumBuffers(fod_display);
+				vid.rowbytes = Sys_Video_GetBytesPerRow(fod_display);
+				vid.buffer = Sys_Video_GetBuffer(fod_display);
+				vid.colormap = host_colormap;
+				vid.direct = 0;
+				vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0);
 
-		r_pixbytes = info->bpp/8;
+				vid.conbuffer = vid.buffer;
+				vid.conrowbytes = vid.rowbytes;
+				vid.conwidth = vid.width;
+				vid.conheight = vid.height;
 
-		VID_SetPalette(palette);
+				r_pixbytes = info->bpp/8;
 
-		Sys_Video_GrabMouse(fod_display, 1);
+				VID_SetPalette(palette);
 
-		S_Startup();
+				Sys_Video_GrabMouse(fod_display, 1);
 
-		return true;
+				S_Startup();
+
+				return true;
+			}
+
+			free(vid_surfcache);
+		}
+
+		free(d_pzbuffer);
 	}
 
 	return false;
@@ -134,6 +157,11 @@ void SWVID_Shutdown(void)
 {
 	if (fod_display)
 	{
+		D_FlushCaches();
+
+		free(vid_surfcache);
+		free(d_pzbuffer);
+
 		Sys_Video_Close(fod_display);
 
 		fod_display = 0;