diff --git a/engine/Makefile b/engine/Makefile
index 69b32e1f8..71bbed75a 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -419,10 +419,8 @@ GLQUAKE_OBJS =		\
 	gl_hlmdl.o
 
 D3DQUAKE_OBJS =		\
-	d3d_draw.o	\
-	d3d_mesh.o	\
-	d3d_rmain.o	\
-	d3d_rsurf.o	\
+	d3d_backend.o \
+	d3d_image.o	\
 	vid_d3d.o	\
 	d3d9_draw.o	\
 	d3d9_mesh.o	\
@@ -590,7 +588,7 @@ ifeq ($(FTE_TARGET),win32_SDL)
 
 	MB_DIR=m_mgw_sdl$(BITS)
 	M_EXE_NAME=../fteqw_sdl.exe
-	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) gl_vidsdl.o snd_sdl.o cd_sdl.o sys_sdl.o in_sdl.o snd_directx.o resources.o
+	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) $(D3DQUAKE_OBJS) gl_vidsdl.o snd_sdl.o cd_sdl.o sys_sdl.o in_sdl.o snd_directx.o resources.o
 	M_CFLAGS=-D_MINGW_VFPRINTF -D_SDL -I./libs/ -I./libs/mingw-libs/  -I./libs/dxsdk7/include/ -I./libs/mingw-libs $(GLCFLAGS) `sdl-config --cflags` -D_MERGED_SDL
 	M_LDFLAGS=$(GLLDFLAGS) $(IMAGELDFLAGS)
 	
@@ -627,7 +625,7 @@ ifeq ($(FTE_TARGET),win64_SDL)
 
 	MB_DIR=m_mgw_sdl$(BITS)
 	M_EXE_NAME=../fteqw_sdl64.exe
-	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) gl_vidsdl.o snd_sdl.o cd_sdl.o sys_sdl.o in_sdl.o snd_directx.o resources.o
+	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) $(D3DQUAKE_OBJS) gl_vidsdl.o snd_sdl.o cd_sdl.o sys_sdl.o in_sdl.o snd_directx.o resources.o
 	M_CFLAGS=-D_MINGW_VFPRINTF -D_SDL -I./libs/ -I./libs/mingw64-libs/  -I./libs/dxsdk7/include/ -I./libs/mingw64-libs $(GLCFLAGS) `sdl-config --cflags` -D_MERGED_SDL
 	M_LDFLAGS=$(GLLDFLAGS) $(IMAGELDFLAGS)
 	
@@ -711,9 +709,9 @@ endif
 	NPQTVCL_DIR=npqtvcl_mgw
 
 ifeq ($(USEASM),true)
-	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) fs_win32.o gl_vidnt.o vid_ddraw.o vid_dib.o vid_win2.o snd_win.o snd_directx.o cd_win.o in_win.o sys_win.o sys_dosa.o resources.o
+	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) $(D3DQUAKE_OBJS) fs_win32.o gl_vidnt.o snd_win.o snd_directx.o cd_win.o in_win.o sys_win.o sys_dosa.o resources.o
 else
-	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) fs_win32.o gl_vidnt.o vid_ddraw.o vid_dib.o vid_win2.o snd_win.o snd_directx.o cd_win.o in_win.o sys_win.o resources.o
+	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) $(D3DQUAKE_OBJS) fs_win32.o gl_vidnt.o snd_win.o snd_directx.o cd_win.o in_win.o sys_win.o resources.o
 endif
 	M_EXE_NAME=../fteqw.exe
 	MCL_EXE_NAME=../fteqwcl.exe
@@ -777,9 +775,9 @@ endif
 	NPQTVCL_DIR=npqtvcl_mgw64
 
 ifeq ($(USEASM),true)
-	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) fs_win32.o gl_vidnt.o vid_ddraw.o vid_dib.o vid_win2.o snd_win.o snd_directx.o cd_win.o in_win.o sys_win.o sys_dosa.o resources.o
+	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) $(D3DQUAKE_OBJS) fs_win32.o gl_vidnt.o snd_win.o snd_directx.o cd_win.o in_win.o sys_win.o sys_dosa.o resources.o
 else
-	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) fs_win32.o gl_vidnt.o vid_ddraw.o vid_dib.o vid_win2.o snd_win.o snd_directx.o cd_win.o in_win.o sys_win.o resources.o
+	MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) $(D3DQUAKE_OBJS) fs_win32.o gl_vidnt.o snd_win.o snd_directx.o cd_win.o in_win.o sys_win.o resources.o
 endif
 	M_EXE_NAME=../fteqw64.exe
 	MCL_EXE_NAME=../fteqwcl64.exe
@@ -968,10 +966,10 @@ SV_DIR?=sv_sdl
 
 .default: help
 all: rel
-rel: sv-rel gl-rel mingl-rel
-dbg: sv-dbg gl-dbg mingl-dbg
+rel: sv-rel gl-rel mingl-rel m-rel
+dbg: sv-dbg gl-dbg mingl-dbg m-dbg
 relcl: glcl-rel mcl-rel
-profile: sv-profile gl-profile mingl-profile
+profile: sv-profile gl-profile mingl-profile m-profile
 
 releases:
 	#this is for releasing things from a linux box
diff --git a/engine/d3d9/d3d9_draw.c b/engine/d3d9/d3d9_draw.c
index fc9241a1b..284133f83 100644
--- a/engine/d3d9/d3d9_draw.c
+++ b/engine/d3d9/d3d9_draw.c
@@ -1,868 +1,883 @@
-#include "quakedef.h"
-#ifdef D3DQUAKE
-#include "winquake.h"
-#include "d3d9quake.h"
-
-#define MAX_WIDTH 512
-#define MAX_HEIGHT 512
-
-void *d3dexplosiontexture;
-void *d3dballtexture;
-
-LPDIRECT3DBASETEXTURE9 d3d9chars_tex;
-mpic_t *conback_tex;
-
-extern cvar_t		gl_picmip;
-extern cvar_t		gl_picmip2d;
-
-typedef struct d3dcachepic_s
-{
-	char		name[MAX_QPATH];
-	mpic_t		pic;
-} d3dcachepic_t;
-#define	MAX_CACHED_PICS		512	//a temporary solution
-d3dcachepic_t	d3dmenu_cachepics[MAX_CACHED_PICS];
-int			d3dmenu_numcachepics;
-
-
-
-typedef struct {
-	float x, y, z;
-	int colour;
-	float s, t;
-} d3dquadvert_t;
-d3dquadvert_t d3d9quadvert[4];
-index_t d3d9quadindexes[6] = {
-	0, 1, 2,
-	0, 2, 3
-};
-//pD3DDev->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX2, d3dstate.vertbuf, d3dstate.numverts, d3dstate.indexbuf, d3dstate.numindicies, 0);
-
-
-static void Upload_Texture_32(LPDIRECT3DTEXTURE9 surf, unsigned int *data, int width, int height)
-{
-	int x, y;
-	unsigned int *dest;
-	unsigned char swapbuf[4];
-	unsigned char swapbuf2[4];
-	D3DLOCKED_RECT lock;
-
-	D3DSURFACE_DESC desc;
-	IDirect3DTexture9_GetLevelDesc(surf, 0, &desc);
-
-	IDirect3DTexture9_LockRect(surf, 0, &lock, NULL, DDLOCK_NOSYSLOCK|D3DLOCK_READONLY);
-		
-		//(surf, NULL, &desc, DDLOCK_NOSYSLOCK|DDLOCK_WAIT|DDLOCK_WRITEONLY|DDLOCK_DISCARDCONTENTS, NULL);
-
-	if (width == desc.Width && height == desc.Height)
-	{
-//		if (desc.lPitch == twidth*4)
-//		{
-//			memcpy(desc.lpSurface, data, width*height*4);
-//		}
-//		else
-		{
-			for (y = 0; y < height; y++)
-			{
-				dest = (unsigned int *)((char *)lock.pBits + lock.Pitch*y);
-				for (x = 0; x < width; x++)
-				{
-					*(unsigned int*)swapbuf2 = *(unsigned int*)swapbuf = data[x];
-					swapbuf[0] = swapbuf2[2];
-					swapbuf[2] = swapbuf2[0];
-					dest[x] = *(unsigned int*)swapbuf;
-				}
-				data += width;
-			}
-		}
-	}
-	else
-	{
-		int x, y;
-		int iny;
-		unsigned int *row, *inrow;
-
-		for (y = 0; y < desc.Height; y++)
-		{
-			row = (unsigned int*)((char *)lock.pBits + lock.Pitch*y);
-			iny = (y * height) / desc.Height;
-			inrow = data + width*iny;
-			for (x = 0; x < desc.Width; x++)
-			{
-				*(unsigned int*)swapbuf2 = *(unsigned int*)swapbuf =  inrow[(x * width)/desc.Width];
-				swapbuf[0] = swapbuf2[2];
-				swapbuf[2] = swapbuf2[0];
-				row[x] = *(unsigned int*)swapbuf;
-			}
-		}
-
-
-
-		//mimic opengl and draw it white
-//		memset(desc.lpSurface, 255, twidth*theight*4);
-	}
-
-	IDirect3DTexture9_UnlockRect(surf, 0);
-}
-
-void D3D9_RoundDimensions(int *scaled_width, int *scaled_height, qboolean mipmap)
-{
-//	if (gl_config.arb_texture_non_power_of_two)	//NPOT is a simple extension that relaxes errors.
-//	{
-//		TRACE(("dbg: GL_RoundDimensions: GL_ARB_texture_non_power_of_two\n"));
-//	}
-//	else
-	{
-		int width = *scaled_width;
-		int height = *scaled_height;
-		for (*scaled_width = 1 ; *scaled_width < width ; *scaled_width<<=1)
-			;
-		for (*scaled_height = 1 ; *scaled_height < height ; *scaled_height<<=1)
-			;
-	}
-
-	if (mipmap)
-	{
-		TRACE(("dbg: GL_RoundDimensions: %i\n", gl_picmip.ival));
-		*scaled_width >>= gl_picmip.ival;
-		*scaled_height >>= gl_picmip.ival;
-	}
-	else
-	{
-		*scaled_width >>= gl_picmip2d.ival;
-		*scaled_height >>= gl_picmip2d.ival;
-	}
-
-	TRACE(("dbg: GL_RoundDimensions: %i\n", gl_max_size.ival));
-	if (gl_max_size.ival)
-	{
-		if (*scaled_width > gl_max_size.ival)
-			*scaled_width = gl_max_size.ival;
-		if (*scaled_height > gl_max_size.ival)
-			*scaled_height = gl_max_size.ival;
-	}
-
-	if (*scaled_width < 1)
-		*scaled_width = 1;
-	if (*scaled_height < 1)
-		*scaled_height = 1;
-}
-
-void D3D9_MipMap (qbyte *out, qbyte *in, int width, int height)
-{
-	int		i, j;
-
-	width <<=2;
-	height >>= 1;
-	for (i=0 ; i<height ; i++, in+=width)
-	{
-		for (j=0 ; j<width ; j+=8, out+=4, in+=8)
-		{
-			out[0] = (in[0] + in[4] + in[width+0] + in[width+4])>>2;
-			out[1] = (in[1] + in[5] + in[width+1] + in[width+5])>>2;
-			out[2] = (in[2] + in[6] + in[width+2] + in[width+6])>>2;
-			out[3] = (in[3] + in[7] + in[width+3] + in[width+7])>>2;
-		}
-	}
-}
-
-//create a basic shader from a 32bit image
-LPDIRECT3DBASETEXTURE9 D3D9_LoadTexture_32(char *name, unsigned int *data, int width, int height, int flags)
-{
-	int nwidth, nheight;
-
-	LPDIRECT3DTEXTURE9 newsurf;
-/*
-	if (!(flags & TF_MANDATORY))
-	{
-		Con_Printf("Texture upload missing flags\n");
-		return NULL;
-	}
-*/
-	
-	nwidth = width;
-	nheight = height;
-	D3D9_RoundDimensions(&nwidth, &nheight, flags & TF_MIPMAP);
-
-	IDirect3DDevice9_CreateTexture(pD3DDev9, nwidth, nheight, 0, 0|((flags & TF_MIPMAP)?D3DUSAGE_AUTOGENMIPMAP:0), D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &newsurf, NULL);
-
-	if (!newsurf)
-		return NULL;
-
-	Upload_Texture_32(newsurf, data, width, height);
-
-	if (flags & TF_MIPMAP)
-		IDirect3DBaseTexture9_GenerateMipSubLevels(newsurf);
-
-	return (LPDIRECT3DBASETEXTURE9)newsurf;
-}
-
-//create a basic shader from an 8bit image with 24bit palette
-LPDIRECT3DBASETEXTURE9 D3D9_LoadTexture_8_Pal24(char *name, unsigned char *data, int width, int height, int flags, unsigned char *palette, int transparentpix)
-{
-	//just expands it to 32bpp and passes it on
-	static unsigned char out[MAX_WIDTH*MAX_HEIGHT][4];
-	int i;
-
-	if (!(flags & TF_ALPHA))
-		transparentpix = 256;
-
-	if (width*height > MAX_WIDTH*MAX_HEIGHT)
-		Sys_Error("GL_Upload8_Pal24: too big");
-
-	for (i = width*height; i >= 0 ; i--)
-	{
-		out[i][0] = palette[data[i]*3+0];
-		out[i][1] = palette[data[i]*3+1];
-		out[i][2] = palette[data[i]*3+2];
-		out[i][3] = 255*(data[i] != transparentpix);
-	}
-
-
-	return D3D9_LoadTexture_32(name, (unsigned int*)out, width, height, flags);
-}
-
-LPDIRECT3DBASETEXTURE9 D3D9_LoadTexture_8_Pal32(char *name, unsigned char *data, int width, int height, int flags, unsigned char *palette)
-{
-	//just expands it to 32bpp and passes it on
-	static unsigned char out[MAX_WIDTH*MAX_HEIGHT][4];
-	int i;
-
-	if (width*height > MAX_WIDTH*MAX_HEIGHT)
-		Sys_Error("GL_Upload8_Pal24: too big");
-
-	for (i = width*height; i >= 0 ; i--)
-	{
-		out[i][0] = palette[data[i]*4+0];
-		out[i][1] = palette[data[i]*4+1];
-		out[i][2] = palette[data[i]*4+2];
-		out[i][3] = palette[data[i]*4+3];
-	}
-
-
-	return D3D9_LoadTexture_32(name, (unsigned int*)out, width, height, flags);
-}
-
-
-void D3D9_UnloadTexture(LPDIRECT3DBASETEXTURE9 tex)
-{
-	if (tex)
-		IDirect3DBaseTexture9_Release(tex);
-}
-
-
-
-
-
-
-
-
-static qbyte	exptexture[16][16] =
-{
-	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-	{0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0},
-	{0,0,0,1,1,1,1,1,3,1,1,2,1,0,0,0},
-	{0,0,0,1,1,1,1,4,4,4,5,4,2,1,1,0},
-	{0,0,1,1,6,5,5,8,6,8,3,6,3,2,1,0},
-	{0,0,1,5,6,7,5,6,8,8,8,3,3,1,0,0},
-	{0,0,0,1,6,8,9,9,9,9,4,6,3,1,0,0},
-	{0,0,2,1,7,7,9,9,9,9,5,3,1,0,0,0},
-	{0,0,2,4,6,8,9,9,9,9,8,6,1,0,0,0},
-	{0,0,2,2,3,5,6,8,9,8,8,4,4,1,0,0},
-	{0,0,1,2,4,1,8,7,8,8,6,5,4,1,0,0},
-	{0,1,1,1,7,8,1,6,7,5,4,7,1,0,0,0},
-	{0,1,2,1,1,5,1,3,4,3,1,1,0,0,0,0},
-	{0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0},
-	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
-};
-void D3D9_InitParticleTexture (void)
-{
-#define PARTICLETEXTURESIZE 64
-	int		x,y;
-	float dx, dy, d;
-	qbyte	data[PARTICLETEXTURESIZE*PARTICLETEXTURESIZE][4];
-
-//Explosion texture
-
-
-	for (x=0 ; x<16 ; x++)
-	{
-		for (y=0 ; y<16 ; y++)
-		{
-			data[y*16+x][0] = 255;
-			data[y*16+x][1] = 255;
-			data[y*16+x][2] = 255;
-			data[y*16+x][3] = exptexture[x][y]*255/9.0;
-		}
-	}
-	d3dexplosiontexture = D3D9_LoadTexture_32("", (unsigned int*)data, 16, 16, TF_ALPHA|TF_NOTBUMPMAP|TF_NOMIPMAP);
-		
-	memset(data, 255, sizeof(data));
-	for (y = 0;y < PARTICLETEXTURESIZE;y++)
-	{
-		dy = (y - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1);
-		for (x = 0;x < PARTICLETEXTURESIZE;x++)
-		{
-			dx = (x - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1);
-			d = 256 * (1 - (dx*dx+dy*dy));
-			d = bound(0, d, 255);
-			data[y*PARTICLETEXTURESIZE+x][3] = (qbyte) d;
-		}
-	}
-
-	d3dballtexture = D3D9_LoadTexture_32("", (unsigned int*)data, PARTICLETEXTURESIZE, PARTICLETEXTURESIZE, TF_ALPHA|TF_NOTBUMPMAP|TF_NOMIPMAP);
-}
-
-
-
-
-
-
-
-
-
-mpic_t	*D3D9_Draw_SafePicFromWad			(char *name)
-{
-	LPDIRECT3DBASETEXTURE9 *p;
-	d3dcachepic_t *pic;
-	qpic_t *qpic;
-	int i;
-
-	for (i = 0; i < d3dmenu_numcachepics; i++)
-	{
-		if (!strcmp(d3dmenu_cachepics[i].name, name))
-			return &d3dmenu_cachepics[i].pic;
-	}
-
-	qpic = (qpic_t *)W_SafeGetLumpName (name);
-	if (qpic)
-		SwapPic (qpic);
-
-	pic = &d3dmenu_cachepics[d3dmenu_numcachepics];
-
-	Q_strncpyz (pic->name, name, sizeof(pic->name));
-
-	p = (LPDIRECT3DBASETEXTURE9*)&pic->pic.d.data;
-	if (!strcmp(name, "conchars"))
-	{
-		pic->pic.width = 256;
-		pic->pic.height = 256;
-		*p = d3d9chars_tex;
-	}
-	else if (qpic)
-	{
-		pic->pic.width = qpic->width;
-		pic->pic.height = qpic->height;
-
-		*p = (LPDIRECT3DBASETEXTURE9)Mod_LoadReplacementTexture(pic->name, "wad", false, true, true);
-		if (!*p)
-			*p = D3D9_LoadTexture_8_Pal24(name, (unsigned char*)(qpic+1), qpic->width, qpic->height, TF_NOMIPMAP|TF_ALPHA|TF_NOTBUMPMAP, host_basepal, 255);
-	}
-	else
-	{
-		extern int image_width, image_height;
-		*p = (LPDIRECT3DBASETEXTURE9)Mod_LoadHiResTexture(pic->name, "wad", false, true, true);
-		if (!p)
-			return NULL;
-		pic->pic.width = image_width;
-		pic->pic.height = image_height;
-	}
-
-	d3dmenu_numcachepics++;
-
-//	Con_Printf("Fixme: D3D9_Draw_SafePicFromWad\n");
-	return &pic->pic;
-}
-mpic_t	*D3D9_Draw_SafeCachePic		(char *path)
-{
-	LPDIRECT3DBASETEXTURE9 *p;
-	d3dcachepic_t *pic;
-	qpic_t *qpic;
-	int i;
-
-
-	for (i = 0; i < d3dmenu_numcachepics; i++)
-	{
-		if (!strcmp(d3dmenu_cachepics[i].name, path))
-			return &d3dmenu_cachepics[i].pic;
-	}
-
-	qpic = (qpic_t *)COM_LoadTempFile (path);
-	if (qpic)
-		SwapPic (qpic);
-
-	pic = &d3dmenu_cachepics[d3dmenu_numcachepics];
-
-	Q_strncpyz (pic->name, path, sizeof(pic->name));
-
-	p = (LPDIRECT3DBASETEXTURE9*)&pic->pic.d.data;
-
-	if (qpic)
-	{
-		pic->pic.width = qpic->width;
-		pic->pic.height = qpic->height;
-		*p = (LPDIRECT3DBASETEXTURE9)Mod_LoadReplacementTexture(pic->name, "gfx", false, true, true);
-		if (!*p && qpic)
-			*p = D3D9_LoadTexture_8_Pal24(path, (unsigned char*)(qpic+1), qpic->width, qpic->height, TF_NOMIPMAP|TF_ALPHA|TF_NOTBUMPMAP, host_basepal, 255);
-	}
-	else
-	{
-		extern int image_width, image_height;
-		*p = (LPDIRECT3DBASETEXTURE9)Mod_LoadHiResTexture(pic->name, "gfx", false, true, true);
-		if (!*p)
-		{
-			return NULL;
-		}
-		pic->pic.width = image_width;
-		pic->pic.height = image_height;
-	}
-
-	d3dmenu_numcachepics++;
-
-//	Con_Printf("Fixme: D3D9_Draw_SafeCachePic\n");
-	return &pic->pic;
-}
-mpic_t	*D3D9_Draw_CachePic			(char *path)
-{
-	mpic_t	*pic;
-	pic = D3D9_Draw_SafeCachePic(path);
-	if (!pic)
-		Sys_Error("Couldn't load picture %s", path);
-	return pic;
-}
-void	D3D9_Draw_ReInit				(void)
-{
-	d3dmenu_numcachepics = 0;
-
-	draw_chars = W_SafeGetLumpName ("conchars");
-
-	d3d9chars_tex = (LPDIRECT3DBASETEXTURE9)Mod_LoadReplacementTexture("conchars", "gfx", false, true, true);
-	if (!d3d9chars_tex)
-	{			
-		if (draw_chars)
-			d3d9chars_tex = D3D9_LoadTexture_8_Pal24("conchars", draw_chars, 128, 128, TF_NOMIPMAP|TF_ALPHA|TF_NOTBUMPMAP, host_basepal, 0);
-		if (!d3d9chars_tex)
-			d3d9chars_tex = (LPDIRECT3DBASETEXTURE9)Mod_LoadHiResTexture("gfx/2d/bigchars.tga", NULL, false, true, false);	//try q3 path
-		if (!d3d9chars_tex)
-			d3d9chars_tex = (LPDIRECT3DBASETEXTURE9)Mod_LoadHiResTexture("pics/conchars.pcx", NULL, false, true, false);	//try low res q2 path
-	}
-
-
-	//now emit the conchars picture as if from a wad.
-	strcpy(d3dmenu_cachepics[d3dmenu_numcachepics].name, "conchars");
-	d3dmenu_cachepics[d3dmenu_numcachepics].pic.width = 128;
-	d3dmenu_cachepics[d3dmenu_numcachepics].pic.height = 128;
-	*(int *)&d3dmenu_cachepics[d3dmenu_numcachepics].pic.d.data = (int)d3d9chars_tex;
-	d3dmenu_numcachepics++;
-
-
-	conback_tex = D3D9_Draw_SafeCachePic("gfx/conback.lmp");
-	if (!conback_tex)
-		conback_tex = D3D9_Draw_SafeCachePic("textures/sfx/logo512.jpg");	//try q3 path
-	if (!conback_tex)
-		conback_tex = D3D9_Draw_SafeCachePic("pics/conback.pcx");
-
-
-	Plug_DrawReloadImages();
-	D3D9_InitParticleTexture();
-}
-void	D3D9_Draw_Init				(void)
-{
-	D3D9_Draw_ReInit();
-}
-void	D3D9_Draw_Character			(int x, int y, unsigned int num)
-{
-	int row;
-	int col;
-	float frow, fcol, size;
-
-#define char_instep 0
-	num &= 255;
-	if (num == ' ')
-		return;
-
-	row = num>>4;
-	col = num&15;
-
-	frow = row*0.0625+char_instep;
-	fcol = col*0.0625+char_instep;
-	size = 0.0625-char_instep*2;
-
-	d3d9quadvert[0].x = x;
-	d3d9quadvert[0].y = y;
-	d3d9quadvert[0].z = 0;
-	d3d9quadvert[0].colour = 0xffffffff;
-	d3d9quadvert[0].s = fcol;
-	d3d9quadvert[0].t = frow;
-
-	d3d9quadvert[1].x = x+8;
-	d3d9quadvert[1].y = y;
-	d3d9quadvert[1].z = 0;
-	d3d9quadvert[1].colour = 0xffffffff;
-	d3d9quadvert[1].s = fcol+size;
-	d3d9quadvert[1].t = frow;
-
-	d3d9quadvert[2].x = x+8;
-	d3d9quadvert[2].y = y+8;
-	d3d9quadvert[2].z = 0;
-	d3d9quadvert[2].colour = 0xffffffff;
-	d3d9quadvert[2].s = fcol+size;
-	d3d9quadvert[2].t = frow+size;
-
-	d3d9quadvert[3].x = x;
-	d3d9quadvert[3].y = y+8;
-	d3d9quadvert[3].z = 0;
-	d3d9quadvert[3].colour = 0xffffffff;
-	d3d9quadvert[3].s = fcol;
-	d3d9quadvert[3].t = frow+size;
-
-	IDirect3DDevice9_SetTexture(pD3DDev9, 0, d3d9chars_tex);
-
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_TEXCOORDINDEX, 0);
-
-	IDirect3DDevice9_SetFVF(pD3DDev9, D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1);
-	IDirect3DDevice9_DrawIndexedPrimitiveUP(pD3DDev9, D3DPT_TRIANGLELIST, 0, 4, 2, d3d9quadindexes, D3DFMT_QINDEX, d3d9quadvert, sizeof(d3d9quadvert[0]));
-}
-
-void	D3D9_Draw_ColouredCharacter	(int x, int y, unsigned int num)
-{
-	int row;
-	int col;
-	float frow, fcol, size;
-	unsigned int imgcolour;
-	unsigned char *c = (unsigned char *)&imgcolour;
-
-#define char_instep 0
-
-	if (num&0xffff == ' ')
-		return;
-
-	col = (num & CON_FGMASK) >> CON_FGSHIFT;
-	c[0] = consolecolours[col].fb*255;
-	c[1] = consolecolours[col].fg*255;
-	c[2] = consolecolours[col].fr*255;
-	c[3] = (num & CON_HALFALPHA)?128:255;
-
-
-	num &= 0xff;
-	row = num>>4;
-	col = num&15;
-
-	frow = row*0.0625+char_instep;
-	fcol = col*0.0625+char_instep;
-	size = 0.0625-char_instep*2;
-
-	d3d9quadvert[0].x = x;
-	d3d9quadvert[0].y = y;
-	d3d9quadvert[0].z = 0;
-	d3d9quadvert[0].colour = imgcolour;
-	d3d9quadvert[0].s = fcol;
-	d3d9quadvert[0].t = frow;
-
-	d3d9quadvert[1].x = x+8;
-	d3d9quadvert[1].y = y;
-	d3d9quadvert[1].z = 0;
-	d3d9quadvert[1].colour = imgcolour;
-	d3d9quadvert[1].s = fcol+size;
-	d3d9quadvert[1].t = frow;
-
-	d3d9quadvert[2].x = x+8;
-	d3d9quadvert[2].y = y+8;
-	d3d9quadvert[2].z = 0;
-	d3d9quadvert[2].colour = imgcolour;
-	d3d9quadvert[2].s = fcol+size;
-	d3d9quadvert[2].t = frow+size;
-
-	d3d9quadvert[3].x = x;
-	d3d9quadvert[3].y = y+8;
-	d3d9quadvert[3].z = 0;
-	d3d9quadvert[3].colour = imgcolour;
-	d3d9quadvert[3].s = fcol;
-	d3d9quadvert[3].t = frow+size;
-
-	IDirect3DDevice9_SetTexture(pD3DDev9, 0, d3d9chars_tex);
-
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_TEXCOORDINDEX, 0);
-
-	IDirect3DDevice9_SetFVF(pD3DDev9, D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1);
-	IDirect3DDevice9_DrawIndexedPrimitiveUP(pD3DDev9, D3DPT_TRIANGLELIST, 0, 4, 2, d3d9quadindexes, D3DFMT_QINDEX, d3d9quadvert, sizeof(d3d9quadvert[0]));
-}
-void	D3D9_Draw_String				(int x, int y, const qbyte *str)
-{
-	while(*str)
-	{
-		D3D9_Draw_Character(x, y, *str++);
-		x+=8;
-	}
-}
-void	D3D9_Draw_Alt_String			(int x, int y, const qbyte *str)
-{
-	while(*str)
-	{
-		D3D9_Draw_Character(x, y, *str++ | 128);
-		x+=8;
-	}
-}
-void	D3D9_Draw_Crosshair			(void)
-{
-	D3D9_Draw_Character(vid.width/2 - 4, vid.height/2 - 4, '+');
-}
-void	D3D9_Draw_DebugChar			(qbyte num)
-{
-	Sys_Error("D3D function not implemented\n");
-}
-void	D3D9_Draw_TransPicTranslate	(int x, int y, int w, int h, qbyte *pic, qbyte *translation)
-{
-//	Sys_Error("D3D function not implemented\n");
-}
-void	D3D9_Draw_TileClear			(int x, int y, int w, int h)
-{
-//	Sys_Error("D3D function not implemented\n");
-}
-void	D3D9_Draw_Fill_I				(int x, int y, int w, int h, unsigned int imgcolour)
-{
-	d3d9quadvert[0].x = x;
-	d3d9quadvert[0].y = y;
-	d3d9quadvert[0].z = 0;
-	d3d9quadvert[0].colour = imgcolour;
-	d3d9quadvert[0].s = 0;
-	d3d9quadvert[0].t = 0;
-
-	d3d9quadvert[1].x = x+w;
-	d3d9quadvert[1].y = y;
-	d3d9quadvert[1].z = 0;
-	d3d9quadvert[1].colour = imgcolour;
-	d3d9quadvert[1].s = 0;
-	d3d9quadvert[1].t = 0;
-
-	d3d9quadvert[2].x = x+w;
-	d3d9quadvert[2].y = y+h;
-	d3d9quadvert[2].z = 0;
-	d3d9quadvert[2].colour = imgcolour;
-	d3d9quadvert[2].s = 0;
-	d3d9quadvert[2].t = 0;
-
-	d3d9quadvert[3].x = x;
-	d3d9quadvert[3].y = y+h;
-	d3d9quadvert[3].z = 0;
-	d3d9quadvert[3].colour = imgcolour;
-	d3d9quadvert[3].s = 0;
-	d3d9quadvert[3].t = 0;
-
-	IDirect3DDevice9_SetTexture(pD3DDev9, 0, NULL);
-
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
-
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
-
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, FALSE );
-
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHABLENDENABLE, TRUE );
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_SRCBLEND,  D3DBLEND_SRCALPHA);
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_DESTBLEND,  D3DBLEND_INVSRCALPHA);
-
-	IDirect3DDevice9_SetFVF(pD3DDev9, D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1);
-	IDirect3DDevice9_DrawIndexedPrimitiveUP(pD3DDev9, D3DPT_TRIANGLELIST, 0, 4, 2, d3d9quadindexes, D3DFMT_QINDEX, d3d9quadvert, sizeof(d3d9quadvert[0]));
-
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHABLENDENABLE, FALSE );
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, TRUE );
-
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
-}
-
-void	D3D9_Draw_FillRGB				(int x, int y, int w, int h, float r, float g, float b)
-{
-	char colours[4];
-	colours[0] = b*255;
-	colours[1] = g*255;
-	colours[2] = r*255;
-	colours[3] = 255;
-
-	D3D9_Draw_Fill_I(x, y, w, h, *(unsigned int*)colours);
-}
-
-void	D3D9_Draw_Fill				(int x, int y, int w, int h, unsigned int c)
-{
-	D3D9_Draw_FillRGB(x, y, w, h, host_basepal[c*3+0]/255.0f, host_basepal[c*3+1]/255.0f, host_basepal[c*3+2]/255.0f);
-}
-void	D3D9_Draw_FadeScreen			(void)
-{
-//	Sys_Error("D3D function not implemented\n");
-}
-void	D3D9_Draw_BeginDisc			(void)
-{
-//	Sys_Error("D3D function not implemented\n");
-}
-void	D3D9_Draw_EndDisc				(void)
-{
-//	Sys_Error("D3D function not implemented\n");
-}
-
-static int imgcolour;
-
-void	D3D9_Draw_Fill_Colours				(int x, int y, int w, int h)
-{
-	D3D9_Draw_Fill_I(x, y, w, h, imgcolour);
-}
-
-void	D3D9_Draw_Image					(float x, float y, float w, float h, float s1, float t1, float s2, float t2, mpic_t *pic)
-{
-	LPDIRECT3DBASETEXTURE9 *p;
-	if (!conback_tex)
-		return;
-	if (!pic)
-		return;
-
-	d3d9quadvert[0].x = x;
-	d3d9quadvert[0].y = y;
-	d3d9quadvert[0].z = 0;
-	d3d9quadvert[0].colour = imgcolour;
-	d3d9quadvert[0].s = s1;// - 3.0/pic->width;
-	d3d9quadvert[0].t = t1;
-
-	d3d9quadvert[1].x = x+w;
-	d3d9quadvert[1].y = y;
-	d3d9quadvert[1].z = 0;
-	d3d9quadvert[1].colour = imgcolour;
-	d3d9quadvert[1].s = s2;// - 3.0/pic->width;
-	d3d9quadvert[1].t = t1;
-
-	d3d9quadvert[2].x = x+w;
-	d3d9quadvert[2].y = y+h;
-	d3d9quadvert[2].z = 0;
-	d3d9quadvert[2].colour = imgcolour;
-	d3d9quadvert[2].s = s2;// - 3.0/pic->width;
-	d3d9quadvert[2].t = t2;
-
-	d3d9quadvert[3].x = x;
-	d3d9quadvert[3].y = y+h;
-	d3d9quadvert[3].z = 0;
-	d3d9quadvert[3].colour = imgcolour;
-	d3d9quadvert[3].s = s1;// - 3.0/pic->width;
-	d3d9quadvert[3].t = t2;
-
-	p = (LPDIRECT3DBASETEXTURE9*)&pic->d.data;
-	IDirect3DDevice9_SetTexture(pD3DDev9, 0, *p);
-
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
-	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_TEXCOORDINDEX, 0);
-
-	IDirect3DDevice9_SetFVF(pD3DDev9, D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1);
-	IDirect3DDevice9_DrawIndexedPrimitiveUP(pD3DDev9, D3DPT_TRIANGLELIST, 0, 4, 2, d3d9quadindexes, D3DFMT_QINDEX, d3d9quadvert, sizeof(d3d9quadvert[0]));
-
-}
-
-void	D3D9_Draw_ScalePic				(int x, int y, int width, int height, mpic_t *pic)
-{
-	D3D9_Draw_Image(x, y, width, height, 0, 0, 1, 1, pic);
-}
-void	D3D9_Draw_SubPic				(int x, int y, mpic_t *pic, int srcx, int srcy, int width, int height)
-{
-	float s, t;
-	float sw, tw;
-	if (!pic)
-		return;
-
-	s = (float)srcx/pic->width;
-	t = (float)srcy/pic->height;
-	sw = (float)width/pic->width;
-	tw = (float)height/pic->height;
-	D3D9_Draw_Image(x, y, width, height, s, t, s+sw, t+tw, pic);
-}
-void	D3D9_Draw_TransPic			(int x, int y, mpic_t *pic)
-{
-	if (!pic)
-		return;
-	D3D9_Draw_Image(x, y, pic->width, pic->height, 0, 0, 1, 1, pic);
-}
-void	D3D9_Draw_Pic					(int x, int y, mpic_t *pic)
-{
-	if (!pic)
-		return;
-	D3D9_Draw_Image(x, y, pic->width, pic->height, 0, 0, 1, 1, pic);
-}
-void	D3D9_Draw_ImageColours		(float r, float g, float b, float a)
-{
-	unsigned char *c = (unsigned char *)&imgcolour;
-	
-	c[0] = b*255;
-	c[1] = g*255;
-	c[2] = r*255;
-	c[3] = a*255;
-}
-
-void	D3D9_Draw_ConsoleBackground	(int firstline, int lastline, qboolean forceopaque)
-{
-	D3D9_Draw_ImageColours(1,1,1,1);
-	D3D9_Draw_Image(0, 0, vid.width, lastline, 0, 1 - (float)lastline/vid.height, 1, 1, conback_tex);
-}
-void	D3D9_Draw_EditorBackground	(int lines)
-{
-	D3D9_Draw_ConsoleBackground(0, lines, false);
-}
-
-
-
-
-void D3D9_Media_ShowFrameBGR_24_Flip	(qbyte *framedata, int inwidth, int inheight)
-{
-	mpic_t pic;
-	LPDIRECT3DBASETEXTURE9 *p;
-	p = (LPDIRECT3DBASETEXTURE9*)&pic.d.data;
-	*p = D3D9_LoadTexture_32("", (unsigned int*)framedata, inwidth, inheight, TF_NOMIPMAP|TF_NOALPHA|TF_NOTBUMPMAP);
-
-	D3D9_Set2D ();
-	D3D9_Draw_ImageColours(1,1,1,1);
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, FALSE );
-	D3D9_Draw_Image(0, 0, vid.width, vid.height, 0, 1, 1, 0, &pic);
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, TRUE );
-
-	D3D9_UnloadTexture(*p);
-}	//input is bottom up...
-void D3D9_Media_ShowFrameRGBA_32		(qbyte *framedata, int inwidth, int inheight)
-{
-	mpic_t pic;
-	LPDIRECT3DBASETEXTURE9 *p;
-
-	pic.width = inwidth;
-	pic.height = inheight;
-	pic.flags = 0;
-	p = (LPDIRECT3DBASETEXTURE9*)&pic.d;
-	*p = D3D9_LoadTexture_32("", (unsigned int*)framedata, inwidth, inheight, TF_NOMIPMAP|TF_NOALPHA|TF_NOTBUMPMAP);
-
-	D3D9_Set2D ();
-	D3D9_Draw_ImageColours(1,1,1,1);
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, FALSE );
-	D3D9_Draw_Image(0, 0, vid.width, vid.height, 0, 0, 1, 1, &pic);
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, TRUE );
-
-	D3D9_UnloadTexture(*p);
-}	//top down
-void (D3D9_Media_ShowFrame8bit)			(qbyte *framedata, int inwidth, int inheight, qbyte *palette)
-{
-	mpic_t pic;
-	LPDIRECT3DBASETEXTURE9 *p;
-	p = (LPDIRECT3DBASETEXTURE9*)&pic.d;
-	*p = D3D9_LoadTexture_8_Pal24("", (unsigned char*)framedata, inwidth, inheight, TF_NOMIPMAP|TF_NOALPHA|TF_NOTBUMPMAP, palette, 256);
-
-	D3D9_Set2D ();
-	D3D9_Draw_ImageColours(1,1,1,1);
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, FALSE );
-	D3D9_Draw_Image(0, 0, vid.width, vid.height, 0, 0, 1, 1, &pic);
-	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, TRUE );
-
-	D3D9_UnloadTexture(*p);
-}	//paletted topdown (framedata is 8bit indexes into palette)
-#endif
+#include "quakedef.h"
+#ifdef D3DQUAKE
+#include "winquake.h"
+#include "d3d9quake.h"
+
+#define MAX_WIDTH 512
+#define MAX_HEIGHT 512
+
+void *d3dexplosiontexture;
+void *d3dballtexture;
+
+LPDIRECT3DBASETEXTURE9 d3d9chars_tex;
+mpic_t *conback_tex;
+
+extern cvar_t		gl_picmip;
+extern cvar_t		gl_picmip2d;
+
+typedef struct d3dcachepic_s
+{
+	char		name[MAX_QPATH];
+	mpic_t		pic;
+} d3dcachepic_t;
+#define	MAX_CACHED_PICS		512	//a temporary solution
+d3dcachepic_t	d3dmenu_cachepics[MAX_CACHED_PICS];
+int			d3dmenu_numcachepics;
+
+#ifdef MINGW // these are undefined in MinGW
+	const unsigned int TF_COLOR = 1;
+	const unsigned int TF_ALPHA = 2;
+	const unsigned int TF_MASKED = 4;
+	const unsigned int TF_MIPMAP = 8;
+	const unsigned int TF_CLAMP = 16;
+	const unsigned int TF_ANISOTROPIC = 32;
+	const unsigned int TF_SPHEREMAP = 64;
+	const unsigned int TF_CUBEMAP = 128;
+	const unsigned int TF_NORMALCUBE = 512;
+	const unsigned int TF_NOTBUMPMAP = 0; //made this up
+	const unsigned int TF_NOMIPMAP = 0; //made this up
+	const unsigned int TF_NOALPHA = 0; //made this up
+#endif
+
+
+
+typedef struct {
+	float x, y, z;
+	int colour;
+	float s, t;
+} d3dquadvert_t;
+d3dquadvert_t d3d9quadvert[4];
+index_t d3d9quadindexes[6] = {
+	0, 1, 2,
+	0, 2, 3
+};
+//pD3DDev->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX2, d3dstate.vertbuf, d3dstate.numverts, d3dstate.indexbuf, d3dstate.numindicies, 0);
+
+
+static void Upload_Texture_32(LPDIRECT3DTEXTURE9 surf, unsigned int *data, int width, int height)
+{
+	int x, y;
+	unsigned int *dest;
+	unsigned char swapbuf[4];
+	unsigned char swapbuf2[4];
+	D3DLOCKED_RECT lock;
+
+	D3DSURFACE_DESC desc;
+	IDirect3DTexture9_GetLevelDesc(surf, 0, &desc);
+
+	IDirect3DTexture9_LockRect(surf, 0, &lock, NULL, DDLOCK_NOSYSLOCK|D3DLOCK_READONLY);
+		
+		//(surf, NULL, &desc, DDLOCK_NOSYSLOCK|DDLOCK_WAIT|DDLOCK_WRITEONLY|DDLOCK_DISCARDCONTENTS, NULL);
+
+	if (width == desc.Width && height == desc.Height)
+	{
+//		if (desc.lPitch == twidth*4)
+//		{
+//			memcpy(desc.lpSurface, data, width*height*4);
+//		}
+//		else
+		{
+			for (y = 0; y < height; y++)
+			{
+				dest = (unsigned int *)((char *)lock.pBits + lock.Pitch*y);
+				for (x = 0; x < width; x++)
+				{
+					*(unsigned int*)swapbuf2 = *(unsigned int*)swapbuf = data[x];
+					swapbuf[0] = swapbuf2[2];
+					swapbuf[2] = swapbuf2[0];
+					dest[x] = *(unsigned int*)swapbuf;
+				}
+				data += width;
+			}
+		}
+	}
+	else
+	{
+		int x, y;
+		int iny;
+		unsigned int *row, *inrow;
+
+		for (y = 0; y < desc.Height; y++)
+		{
+			row = (unsigned int*)((char *)lock.pBits + lock.Pitch*y);
+			iny = (y * height) / desc.Height;
+			inrow = data + width*iny;
+			for (x = 0; x < desc.Width; x++)
+			{
+				*(unsigned int*)swapbuf2 = *(unsigned int*)swapbuf =  inrow[(x * width)/desc.Width];
+				swapbuf[0] = swapbuf2[2];
+				swapbuf[2] = swapbuf2[0];
+				row[x] = *(unsigned int*)swapbuf;
+			}
+		}
+
+
+
+		//mimic opengl and draw it white
+//		memset(desc.lpSurface, 255, twidth*theight*4);
+	}
+
+	IDirect3DTexture9_UnlockRect(surf, 0);
+}
+
+void D3D9_RoundDimensions(int *scaled_width, int *scaled_height, qboolean mipmap)
+{
+//	if (gl_config.arb_texture_non_power_of_two)	//NPOT is a simple extension that relaxes errors.
+//	{
+//		TRACE(("dbg: GL_RoundDimensions: GL_ARB_texture_non_power_of_two\n"));
+//	}
+//	else
+	{
+		int width = *scaled_width;
+		int height = *scaled_height;
+		for (*scaled_width = 1 ; *scaled_width < width ; *scaled_width<<=1)
+			;
+		for (*scaled_height = 1 ; *scaled_height < height ; *scaled_height<<=1)
+			;
+	}
+
+	if (mipmap)
+	{
+		TRACE(("dbg: GL_RoundDimensions: %i\n", gl_picmip.ival));
+		*scaled_width >>= gl_picmip.ival;
+		*scaled_height >>= gl_picmip.ival;
+	}
+	else
+	{
+		*scaled_width >>= gl_picmip2d.ival;
+		*scaled_height >>= gl_picmip2d.ival;
+	}
+
+	TRACE(("dbg: GL_RoundDimensions: %i\n", gl_max_size.ival));
+	if (gl_max_size.ival)
+	{
+		if (*scaled_width > gl_max_size.ival)
+			*scaled_width = gl_max_size.ival;
+		if (*scaled_height > gl_max_size.ival)
+			*scaled_height = gl_max_size.ival;
+	}
+
+	if (*scaled_width < 1)
+		*scaled_width = 1;
+	if (*scaled_height < 1)
+		*scaled_height = 1;
+}
+
+void D3D9_MipMap (qbyte *out, qbyte *in, int width, int height)
+{
+	int		i, j;
+
+	width <<=2;
+	height >>= 1;
+	for (i=0 ; i<height ; i++, in+=width)
+	{
+		for (j=0 ; j<width ; j+=8, out+=4, in+=8)
+		{
+			out[0] = (in[0] + in[4] + in[width+0] + in[width+4])>>2;
+			out[1] = (in[1] + in[5] + in[width+1] + in[width+5])>>2;
+			out[2] = (in[2] + in[6] + in[width+2] + in[width+6])>>2;
+			out[3] = (in[3] + in[7] + in[width+3] + in[width+7])>>2;
+		}
+	}
+}
+
+//create a basic shader from a 32bit image
+LPDIRECT3DBASETEXTURE9 D3D9_LoadTexture_32(char *name, unsigned int *data, int width, int height, int flags)
+{
+	int nwidth, nheight;
+
+	LPDIRECT3DTEXTURE9 newsurf;
+/*
+	if (!(flags & TF_MANDATORY))
+	{
+		Con_Printf("Texture upload missing flags\n");
+		return NULL;
+	}
+*/
+	
+	nwidth = width;
+	nheight = height;
+	D3D9_RoundDimensions(&nwidth, &nheight, flags & TF_MIPMAP);
+
+	IDirect3DDevice9_CreateTexture(pD3DDev9, nwidth, nheight, 0, 0|((flags & TF_MIPMAP)?D3DUSAGE_AUTOGENMIPMAP:0), D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &newsurf, NULL);
+
+	if (!newsurf)
+		return NULL;
+
+	Upload_Texture_32(newsurf, data, width, height);
+
+	if (flags & TF_MIPMAP)
+		IDirect3DBaseTexture9_GenerateMipSubLevels(newsurf);
+
+	return (LPDIRECT3DBASETEXTURE9)newsurf;
+}
+
+//create a basic shader from an 8bit image with 24bit palette
+LPDIRECT3DBASETEXTURE9 D3D9_LoadTexture_8_Pal24(char *name, unsigned char *data, int width, int height, int flags, unsigned char *palette, int transparentpix)
+{
+	//just expands it to 32bpp and passes it on
+	static unsigned char out[MAX_WIDTH*MAX_HEIGHT][4];
+	int i;
+
+	if (!(flags & TF_ALPHA))
+		transparentpix = 256;
+
+	if (width*height > MAX_WIDTH*MAX_HEIGHT)
+		Sys_Error("GL_Upload8_Pal24: too big");
+
+	for (i = width*height; i >= 0 ; i--)
+	{
+		out[i][0] = palette[data[i]*3+0];
+		out[i][1] = palette[data[i]*3+1];
+		out[i][2] = palette[data[i]*3+2];
+		out[i][3] = 255*(data[i] != transparentpix);
+	}
+
+
+	return D3D9_LoadTexture_32(name, (unsigned int*)out, width, height, flags);
+}
+
+LPDIRECT3DBASETEXTURE9 D3D9_LoadTexture_8_Pal32(char *name, unsigned char *data, int width, int height, int flags, unsigned char *palette)
+{
+	//just expands it to 32bpp and passes it on
+	static unsigned char out[MAX_WIDTH*MAX_HEIGHT][4];
+	int i;
+
+	if (width*height > MAX_WIDTH*MAX_HEIGHT)
+		Sys_Error("GL_Upload8_Pal24: too big");
+
+	for (i = width*height; i >= 0 ; i--)
+	{
+		out[i][0] = palette[data[i]*4+0];
+		out[i][1] = palette[data[i]*4+1];
+		out[i][2] = palette[data[i]*4+2];
+		out[i][3] = palette[data[i]*4+3];
+	}
+
+
+	return D3D9_LoadTexture_32(name, (unsigned int*)out, width, height, flags);
+}
+
+
+void D3D9_UnloadTexture(LPDIRECT3DBASETEXTURE9 tex)
+{
+	if (tex)
+		IDirect3DBaseTexture9_Release(tex);
+}
+
+
+
+
+
+
+
+
+static qbyte	exptexture[16][16] =
+{
+	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+	{0,0,0,0,1,0,0,0,1,0,0,1,0,0,0,0},
+	{0,0,0,1,1,1,1,1,3,1,1,2,1,0,0,0},
+	{0,0,0,1,1,1,1,4,4,4,5,4,2,1,1,0},
+	{0,0,1,1,6,5,5,8,6,8,3,6,3,2,1,0},
+	{0,0,1,5,6,7,5,6,8,8,8,3,3,1,0,0},
+	{0,0,0,1,6,8,9,9,9,9,4,6,3,1,0,0},
+	{0,0,2,1,7,7,9,9,9,9,5,3,1,0,0,0},
+	{0,0,2,4,6,8,9,9,9,9,8,6,1,0,0,0},
+	{0,0,2,2,3,5,6,8,9,8,8,4,4,1,0,0},
+	{0,0,1,2,4,1,8,7,8,8,6,5,4,1,0,0},
+	{0,1,1,1,7,8,1,6,7,5,4,7,1,0,0,0},
+	{0,1,2,1,1,5,1,3,4,3,1,1,0,0,0,0},
+	{0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0},
+	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+};
+void D3D9_InitParticleTexture (void)
+{
+#define PARTICLETEXTURESIZE 64
+	int		x,y;
+	float dx, dy, d;
+	qbyte	data[PARTICLETEXTURESIZE*PARTICLETEXTURESIZE][4];
+
+//Explosion texture
+
+
+	for (x=0 ; x<16 ; x++)
+	{
+		for (y=0 ; y<16 ; y++)
+		{
+			data[y*16+x][0] = 255;
+			data[y*16+x][1] = 255;
+			data[y*16+x][2] = 255;
+			data[y*16+x][3] = exptexture[x][y]*255/9.0;
+		}
+	}
+	d3dexplosiontexture = D3D9_LoadTexture_32("", (unsigned int*)data, 16, 16, TF_ALPHA|TF_NOTBUMPMAP|TF_NOMIPMAP);
+		
+	memset(data, 255, sizeof(data));
+	for (y = 0;y < PARTICLETEXTURESIZE;y++)
+	{
+		dy = (y - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1);
+		for (x = 0;x < PARTICLETEXTURESIZE;x++)
+		{
+			dx = (x - 0.5f*PARTICLETEXTURESIZE) / (PARTICLETEXTURESIZE*0.5f-1);
+			d = 256 * (1 - (dx*dx+dy*dy));
+			d = bound(0, d, 255);
+			data[y*PARTICLETEXTURESIZE+x][3] = (qbyte) d;
+		}
+	}
+
+	d3dballtexture = D3D9_LoadTexture_32("", (unsigned int*)data, PARTICLETEXTURESIZE, PARTICLETEXTURESIZE, TF_ALPHA|TF_NOTBUMPMAP|TF_NOMIPMAP);
+}
+
+
+
+
+
+
+
+
+
+mpic_t	*D3D9_Draw_SafePicFromWad			(char *name)
+{
+	LPDIRECT3DBASETEXTURE9 *p;
+	d3dcachepic_t *pic;
+	qpic_t *qpic;
+	int i;
+
+	for (i = 0; i < d3dmenu_numcachepics; i++)
+	{
+		if (!strcmp(d3dmenu_cachepics[i].name, name))
+			return &d3dmenu_cachepics[i].pic;
+	}
+
+	qpic = (qpic_t *)W_SafeGetLumpName (name);
+	if (qpic)
+		SwapPic (qpic);
+
+	pic = &d3dmenu_cachepics[d3dmenu_numcachepics];
+
+	Q_strncpyz (pic->name, name, sizeof(pic->name));
+
+	p = (LPDIRECT3DBASETEXTURE9*)&pic->pic.d.data;
+	if (!strcmp(name, "conchars"))
+	{
+		pic->pic.width = 256;
+		pic->pic.height = 256;
+		*p = d3d9chars_tex;
+	}
+	else if (qpic)
+	{
+		pic->pic.width = qpic->width;
+		pic->pic.height = qpic->height;
+
+		*p = (LPDIRECT3DBASETEXTURE9)Mod_LoadReplacementTexture(pic->name, "wad", false, true, true);
+		if (!*p)
+			*p = D3D9_LoadTexture_8_Pal24(name, (unsigned char*)(qpic+1), qpic->width, qpic->height, TF_NOMIPMAP|TF_ALPHA|TF_NOTBUMPMAP, host_basepal, 255);
+	}
+	else
+	{
+		extern int image_width, image_height;
+		*p = (LPDIRECT3DBASETEXTURE9)Mod_LoadHiResTexture(pic->name, "wad", false, true, true);
+		if (!p)
+			return NULL;
+		pic->pic.width = image_width;
+		pic->pic.height = image_height;
+	}
+
+	d3dmenu_numcachepics++;
+
+//	Con_Printf("Fixme: D3D9_Draw_SafePicFromWad\n");
+	return &pic->pic;
+}
+mpic_t	*D3D9_Draw_SafeCachePic		(char *path)
+{
+	LPDIRECT3DBASETEXTURE9 *p;
+	d3dcachepic_t *pic;
+	qpic_t *qpic;
+	int i;
+
+
+	for (i = 0; i < d3dmenu_numcachepics; i++)
+	{
+		if (!strcmp(d3dmenu_cachepics[i].name, path))
+			return &d3dmenu_cachepics[i].pic;
+	}
+
+	qpic = (qpic_t *)COM_LoadTempFile (path);
+	if (qpic)
+		SwapPic (qpic);
+
+	pic = &d3dmenu_cachepics[d3dmenu_numcachepics];
+
+	Q_strncpyz (pic->name, path, sizeof(pic->name));
+
+	p = (LPDIRECT3DBASETEXTURE9*)&pic->pic.d.data;
+
+	if (qpic)
+	{
+		pic->pic.width = qpic->width;
+		pic->pic.height = qpic->height;
+		*p = (LPDIRECT3DBASETEXTURE9)Mod_LoadReplacementTexture(pic->name, "gfx", false, true, true);
+		if (!*p && qpic)
+			*p = D3D9_LoadTexture_8_Pal24(path, (unsigned char*)(qpic+1), qpic->width, qpic->height, TF_NOMIPMAP|TF_ALPHA|TF_NOTBUMPMAP, host_basepal, 255);
+	}
+	else
+	{
+		extern int image_width, image_height;
+		*p = (LPDIRECT3DBASETEXTURE9)Mod_LoadHiResTexture(pic->name, "gfx", false, true, true);
+		if (!*p)
+		{
+			return NULL;
+		}
+		pic->pic.width = image_width;
+		pic->pic.height = image_height;
+	}
+
+	d3dmenu_numcachepics++;
+
+//	Con_Printf("Fixme: D3D9_Draw_SafeCachePic\n");
+	return &pic->pic;
+}
+mpic_t	*D3D9_Draw_CachePic			(char *path)
+{
+	mpic_t	*pic;
+	pic = D3D9_Draw_SafeCachePic(path);
+	if (!pic)
+		Sys_Error("Couldn't load picture %s", path);
+	return pic;
+}
+void	D3D9_Draw_ReInit				(void)
+{
+	d3dmenu_numcachepics = 0;
+
+	draw_chars = W_SafeGetLumpName ("conchars");
+
+	d3d9chars_tex = (LPDIRECT3DBASETEXTURE9)Mod_LoadReplacementTexture("conchars", "gfx", false, true, true);
+	if (!d3d9chars_tex)
+	{			
+		if (draw_chars)
+			d3d9chars_tex = D3D9_LoadTexture_8_Pal24("conchars", draw_chars, 128, 128, TF_NOMIPMAP|TF_ALPHA|TF_NOTBUMPMAP, host_basepal, 0);
+		if (!d3d9chars_tex)
+			d3d9chars_tex = (LPDIRECT3DBASETEXTURE9)Mod_LoadHiResTexture("gfx/2d/bigchars.tga", NULL, false, true, false);	//try q3 path
+		if (!d3d9chars_tex)
+			d3d9chars_tex = (LPDIRECT3DBASETEXTURE9)Mod_LoadHiResTexture("pics/conchars.pcx", NULL, false, true, false);	//try low res q2 path
+	}
+
+
+	//now emit the conchars picture as if from a wad.
+	strcpy(d3dmenu_cachepics[d3dmenu_numcachepics].name, "conchars");
+	d3dmenu_cachepics[d3dmenu_numcachepics].pic.width = 128;
+	d3dmenu_cachepics[d3dmenu_numcachepics].pic.height = 128;
+	*(int *)&d3dmenu_cachepics[d3dmenu_numcachepics].pic.d.data = (int)d3d9chars_tex;
+	d3dmenu_numcachepics++;
+
+
+	conback_tex = D3D9_Draw_SafeCachePic("gfx/conback.lmp");
+	if (!conback_tex)
+		conback_tex = D3D9_Draw_SafeCachePic("textures/sfx/logo512.jpg");	//try q3 path
+	if (!conback_tex)
+		conback_tex = D3D9_Draw_SafeCachePic("pics/conback.pcx");
+
+
+	Plug_DrawReloadImages();
+	D3D9_InitParticleTexture();
+}
+void	D3D9_Draw_Init				(void)
+{
+	D3D9_Draw_ReInit();
+}
+void	D3D9_Draw_Character			(int x, int y, unsigned int num)
+{
+	int row;
+	int col;
+	float frow, fcol, size;
+
+#define char_instep 0
+	num &= 255;
+	if (num == ' ')
+		return;
+
+	row = num>>4;
+	col = num&15;
+
+	frow = row*0.0625+char_instep;
+	fcol = col*0.0625+char_instep;
+	size = 0.0625-char_instep*2;
+
+	d3d9quadvert[0].x = x;
+	d3d9quadvert[0].y = y;
+	d3d9quadvert[0].z = 0;
+	d3d9quadvert[0].colour = 0xffffffff;
+	d3d9quadvert[0].s = fcol;
+	d3d9quadvert[0].t = frow;
+
+	d3d9quadvert[1].x = x+8;
+	d3d9quadvert[1].y = y;
+	d3d9quadvert[1].z = 0;
+	d3d9quadvert[1].colour = 0xffffffff;
+	d3d9quadvert[1].s = fcol+size;
+	d3d9quadvert[1].t = frow;
+
+	d3d9quadvert[2].x = x+8;
+	d3d9quadvert[2].y = y+8;
+	d3d9quadvert[2].z = 0;
+	d3d9quadvert[2].colour = 0xffffffff;
+	d3d9quadvert[2].s = fcol+size;
+	d3d9quadvert[2].t = frow+size;
+
+	d3d9quadvert[3].x = x;
+	d3d9quadvert[3].y = y+8;
+	d3d9quadvert[3].z = 0;
+	d3d9quadvert[3].colour = 0xffffffff;
+	d3d9quadvert[3].s = fcol;
+	d3d9quadvert[3].t = frow+size;
+
+	IDirect3DDevice9_SetTexture(pD3DDev9, 0, d3d9chars_tex);
+
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_TEXCOORDINDEX, 0);
+
+	IDirect3DDevice9_SetFVF(pD3DDev9, D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1);
+	IDirect3DDevice9_DrawIndexedPrimitiveUP(pD3DDev9, D3DPT_TRIANGLELIST, 0, 4, 2, d3d9quadindexes, D3DFMT_QINDEX, d3d9quadvert, sizeof(d3d9quadvert[0]));
+}
+
+void	D3D9_Draw_ColouredCharacter	(int x, int y, unsigned int num)
+{
+	int row;
+	int col;
+	float frow, fcol, size;
+	unsigned int imgcolour;
+	unsigned char *c = (unsigned char *)&imgcolour;
+
+#define char_instep 0
+
+	if (num&0xffff == ' ')
+		return;
+
+	col = (num & CON_FGMASK) >> CON_FGSHIFT;
+	c[0] = consolecolours[col].fb*255;
+	c[1] = consolecolours[col].fg*255;
+	c[2] = consolecolours[col].fr*255;
+	c[3] = (num & CON_HALFALPHA)?128:255;
+
+
+	num &= 0xff;
+	row = num>>4;
+	col = num&15;
+
+	frow = row*0.0625+char_instep;
+	fcol = col*0.0625+char_instep;
+	size = 0.0625-char_instep*2;
+
+	d3d9quadvert[0].x = x;
+	d3d9quadvert[0].y = y;
+	d3d9quadvert[0].z = 0;
+	d3d9quadvert[0].colour = imgcolour;
+	d3d9quadvert[0].s = fcol;
+	d3d9quadvert[0].t = frow;
+
+	d3d9quadvert[1].x = x+8;
+	d3d9quadvert[1].y = y;
+	d3d9quadvert[1].z = 0;
+	d3d9quadvert[1].colour = imgcolour;
+	d3d9quadvert[1].s = fcol+size;
+	d3d9quadvert[1].t = frow;
+
+	d3d9quadvert[2].x = x+8;
+	d3d9quadvert[2].y = y+8;
+	d3d9quadvert[2].z = 0;
+	d3d9quadvert[2].colour = imgcolour;
+	d3d9quadvert[2].s = fcol+size;
+	d3d9quadvert[2].t = frow+size;
+
+	d3d9quadvert[3].x = x;
+	d3d9quadvert[3].y = y+8;
+	d3d9quadvert[3].z = 0;
+	d3d9quadvert[3].colour = imgcolour;
+	d3d9quadvert[3].s = fcol;
+	d3d9quadvert[3].t = frow+size;
+
+	IDirect3DDevice9_SetTexture(pD3DDev9, 0, d3d9chars_tex);
+
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_TEXCOORDINDEX, 0);
+
+	IDirect3DDevice9_SetFVF(pD3DDev9, D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1);
+	IDirect3DDevice9_DrawIndexedPrimitiveUP(pD3DDev9, D3DPT_TRIANGLELIST, 0, 4, 2, d3d9quadindexes, D3DFMT_QINDEX, d3d9quadvert, sizeof(d3d9quadvert[0]));
+}
+void	D3D9_Draw_String				(int x, int y, const qbyte *str)
+{
+	while(*str)
+	{
+		D3D9_Draw_Character(x, y, *str++);
+		x+=8;
+	}
+}
+void	D3D9_Draw_Alt_String			(int x, int y, const qbyte *str)
+{
+	while(*str)
+	{
+		D3D9_Draw_Character(x, y, *str++ | 128);
+		x+=8;
+	}
+}
+void	D3D9_Draw_Crosshair			(void)
+{
+	D3D9_Draw_Character(vid.width/2 - 4, vid.height/2 - 4, '+');
+}
+void	D3D9_Draw_DebugChar			(qbyte num)
+{
+	Sys_Error("D3D function not implemented\n");
+}
+void	D3D9_Draw_TransPicTranslate	(int x, int y, int w, int h, qbyte *pic, qbyte *translation)
+{
+//	Sys_Error("D3D function not implemented\n");
+}
+void	D3D9_Draw_TileClear			(int x, int y, int w, int h)
+{
+//	Sys_Error("D3D function not implemented\n");
+}
+void	D3D9_Draw_Fill_I				(int x, int y, int w, int h, unsigned int imgcolour)
+{
+	d3d9quadvert[0].x = x;
+	d3d9quadvert[0].y = y;
+	d3d9quadvert[0].z = 0;
+	d3d9quadvert[0].colour = imgcolour;
+	d3d9quadvert[0].s = 0;
+	d3d9quadvert[0].t = 0;
+
+	d3d9quadvert[1].x = x+w;
+	d3d9quadvert[1].y = y;
+	d3d9quadvert[1].z = 0;
+	d3d9quadvert[1].colour = imgcolour;
+	d3d9quadvert[1].s = 0;
+	d3d9quadvert[1].t = 0;
+
+	d3d9quadvert[2].x = x+w;
+	d3d9quadvert[2].y = y+h;
+	d3d9quadvert[2].z = 0;
+	d3d9quadvert[2].colour = imgcolour;
+	d3d9quadvert[2].s = 0;
+	d3d9quadvert[2].t = 0;
+
+	d3d9quadvert[3].x = x;
+	d3d9quadvert[3].y = y+h;
+	d3d9quadvert[3].z = 0;
+	d3d9quadvert[3].colour = imgcolour;
+	d3d9quadvert[3].s = 0;
+	d3d9quadvert[3].t = 0;
+
+	IDirect3DDevice9_SetTexture(pD3DDev9, 0, NULL);
+
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
+
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
+
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, FALSE );
+
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHABLENDENABLE, TRUE );
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_SRCBLEND,  D3DBLEND_SRCALPHA);
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_DESTBLEND,  D3DBLEND_INVSRCALPHA);
+
+	IDirect3DDevice9_SetFVF(pD3DDev9, D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1);
+	IDirect3DDevice9_DrawIndexedPrimitiveUP(pD3DDev9, D3DPT_TRIANGLELIST, 0, 4, 2, d3d9quadindexes, D3DFMT_QINDEX, d3d9quadvert, sizeof(d3d9quadvert[0]));
+
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHABLENDENABLE, FALSE );
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, TRUE );
+
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);
+}
+
+void	D3D9_Draw_FillRGB				(int x, int y, int w, int h, float r, float g, float b)
+{
+	char colours[4];
+	colours[0] = b*255;
+	colours[1] = g*255;
+	colours[2] = r*255;
+	colours[3] = 255;
+
+	D3D9_Draw_Fill_I(x, y, w, h, *(unsigned int*)colours);
+}
+
+void	D3D9_Draw_Fill				(int x, int y, int w, int h, unsigned int c)
+{
+	D3D9_Draw_FillRGB(x, y, w, h, host_basepal[c*3+0]/255.0f, host_basepal[c*3+1]/255.0f, host_basepal[c*3+2]/255.0f);
+}
+void	D3D9_Draw_FadeScreen			(void)
+{
+//	Sys_Error("D3D function not implemented\n");
+}
+void	D3D9_Draw_BeginDisc			(void)
+{
+//	Sys_Error("D3D function not implemented\n");
+}
+void	D3D9_Draw_EndDisc				(void)
+{
+//	Sys_Error("D3D function not implemented\n");
+}
+
+static int imgcolour;
+
+void	D3D9_Draw_Fill_Colours				(int x, int y, int w, int h)
+{
+	D3D9_Draw_Fill_I(x, y, w, h, imgcolour);
+}
+
+void	D3D9_Draw_Image					(float x, float y, float w, float h, float s1, float t1, float s2, float t2, mpic_t *pic)
+{
+	LPDIRECT3DBASETEXTURE9 *p;
+	if (!conback_tex)
+		return;
+	if (!pic)
+		return;
+
+	d3d9quadvert[0].x = x;
+	d3d9quadvert[0].y = y;
+	d3d9quadvert[0].z = 0;
+	d3d9quadvert[0].colour = imgcolour;
+	d3d9quadvert[0].s = s1;// - 3.0/pic->width;
+	d3d9quadvert[0].t = t1;
+
+	d3d9quadvert[1].x = x+w;
+	d3d9quadvert[1].y = y;
+	d3d9quadvert[1].z = 0;
+	d3d9quadvert[1].colour = imgcolour;
+	d3d9quadvert[1].s = s2;// - 3.0/pic->width;
+	d3d9quadvert[1].t = t1;
+
+	d3d9quadvert[2].x = x+w;
+	d3d9quadvert[2].y = y+h;
+	d3d9quadvert[2].z = 0;
+	d3d9quadvert[2].colour = imgcolour;
+	d3d9quadvert[2].s = s2;// - 3.0/pic->width;
+	d3d9quadvert[2].t = t2;
+
+	d3d9quadvert[3].x = x;
+	d3d9quadvert[3].y = y+h;
+	d3d9quadvert[3].z = 0;
+	d3d9quadvert[3].colour = imgcolour;
+	d3d9quadvert[3].s = s1;// - 3.0/pic->width;
+	d3d9quadvert[3].t = t2;
+
+	p = (LPDIRECT3DBASETEXTURE9*)&pic->d.data;
+	IDirect3DDevice9_SetTexture(pD3DDev9, 0, *p);
+
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLORARG2, D3DTA_DIFFUSE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_COLOROP, D3DTOP_MODULATE);
+	IDirect3DDevice9_SetTextureStageState(pD3DDev9, 0, D3DTSS_TEXCOORDINDEX, 0);
+
+	IDirect3DDevice9_SetFVF(pD3DDev9, D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1);
+	IDirect3DDevice9_DrawIndexedPrimitiveUP(pD3DDev9, D3DPT_TRIANGLELIST, 0, 4, 2, d3d9quadindexes, D3DFMT_QINDEX, d3d9quadvert, sizeof(d3d9quadvert[0]));
+
+}
+
+void	D3D9_Draw_ScalePic				(int x, int y, int width, int height, mpic_t *pic)
+{
+	D3D9_Draw_Image(x, y, width, height, 0, 0, 1, 1, pic);
+}
+void	D3D9_Draw_SubPic				(int x, int y, mpic_t *pic, int srcx, int srcy, int width, int height)
+{
+	float s, t;
+	float sw, tw;
+	if (!pic)
+		return;
+
+	s = (float)srcx/pic->width;
+	t = (float)srcy/pic->height;
+	sw = (float)width/pic->width;
+	tw = (float)height/pic->height;
+	D3D9_Draw_Image(x, y, width, height, s, t, s+sw, t+tw, pic);
+}
+void	D3D9_Draw_TransPic			(int x, int y, mpic_t *pic)
+{
+	if (!pic)
+		return;
+	D3D9_Draw_Image(x, y, pic->width, pic->height, 0, 0, 1, 1, pic);
+}
+void	D3D9_Draw_Pic					(int x, int y, mpic_t *pic)
+{
+	if (!pic)
+		return;
+	D3D9_Draw_Image(x, y, pic->width, pic->height, 0, 0, 1, 1, pic);
+}
+void	D3D9_Draw_ImageColours		(float r, float g, float b, float a)
+{
+	unsigned char *c = (unsigned char *)&imgcolour;
+	
+	c[0] = b*255;
+	c[1] = g*255;
+	c[2] = r*255;
+	c[3] = a*255;
+}
+
+void	D3D9_Draw_ConsoleBackground	(int firstline, int lastline, qboolean forceopaque)
+{
+	D3D9_Draw_ImageColours(1,1,1,1);
+	D3D9_Draw_Image(0, 0, vid.width, lastline, 0, 1 - (float)lastline/vid.height, 1, 1, conback_tex);
+}
+void	D3D9_Draw_EditorBackground	(int lines)
+{
+	D3D9_Draw_ConsoleBackground(0, lines, false);
+}
+
+
+
+
+void D3D9_Media_ShowFrameBGR_24_Flip	(qbyte *framedata, int inwidth, int inheight)
+{
+	mpic_t pic;
+	LPDIRECT3DBASETEXTURE9 *p;
+	p = (LPDIRECT3DBASETEXTURE9*)&pic.d.data;
+	*p = D3D9_LoadTexture_32("", (unsigned int*)framedata, inwidth, inheight, TF_NOMIPMAP|TF_NOALPHA|TF_NOTBUMPMAP);
+
+	D3D9_Set2D ();
+	D3D9_Draw_ImageColours(1,1,1,1);
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, FALSE );
+	D3D9_Draw_Image(0, 0, vid.width, vid.height, 0, 1, 1, 0, &pic);
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, TRUE );
+
+	D3D9_UnloadTexture(*p);
+}	//input is bottom up...
+void D3D9_Media_ShowFrameRGBA_32		(qbyte *framedata, int inwidth, int inheight)
+{
+	mpic_t pic;
+	LPDIRECT3DBASETEXTURE9 *p;
+
+	pic.width = inwidth;
+	pic.height = inheight;
+	pic.flags = 0;
+	p = (LPDIRECT3DBASETEXTURE9*)&pic.d;
+	*p = D3D9_LoadTexture_32("", (unsigned int*)framedata, inwidth, inheight, TF_NOMIPMAP|TF_NOALPHA|TF_NOTBUMPMAP);
+
+	D3D9_Set2D ();
+	D3D9_Draw_ImageColours(1,1,1,1);
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, FALSE );
+	D3D9_Draw_Image(0, 0, vid.width, vid.height, 0, 0, 1, 1, &pic);
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, TRUE );
+
+	D3D9_UnloadTexture(*p);
+}	//top down
+void (D3D9_Media_ShowFrame8bit)			(qbyte *framedata, int inwidth, int inheight, qbyte *palette)
+{
+	mpic_t pic;
+	LPDIRECT3DBASETEXTURE9 *p;
+	p = (LPDIRECT3DBASETEXTURE9*)&pic.d;
+	*p = D3D9_LoadTexture_8_Pal24("", (unsigned char*)framedata, inwidth, inheight, TF_NOMIPMAP|TF_NOALPHA|TF_NOTBUMPMAP, palette, 256);
+
+	D3D9_Set2D ();
+	D3D9_Draw_ImageColours(1,1,1,1);
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, FALSE );
+	D3D9_Draw_Image(0, 0, vid.width, vid.height, 0, 0, 1, 1, &pic);
+	IDirect3DDevice9_SetRenderState(pD3DDev9, D3DRS_ALPHATESTENABLE, TRUE );
+
+	D3D9_UnloadTexture(*p);
+}	//paletted topdown (framedata is 8bit indexes into palette)
+#endif
diff --git a/engine/d3d9/d3d9quake.h b/engine/d3d9/d3d9quake.h
index e86e67458..9fc6a7d08 100644
--- a/engine/d3d9/d3d9quake.h
+++ b/engine/d3d9/d3d9quake.h
@@ -1,162 +1,164 @@
-//#include    "ddraw.h"
-
-#ifndef D3D9QUAKE_H
-#define D3D9QUAKE_H
-
-
-#include "d3d9.h"
-#include "com_mesh.h"
-#include "glquake.h"
-
-//
-// d3d9_draw.c
-//
-void					D3D9_Draw_Alt_String (int x, int y, const qbyte *str);
-mpic_t*					D3D9_Draw_CachePic (char *path);
-void					D3D9_Draw_Character (int x, int y, unsigned int num);
-void					D3D9_Draw_ColouredCharacter (int x, int y, unsigned int num);
-void					D3D9_Draw_ConsoleBackground	(int firstline, int lastline, qboolean forceopaque);
-void					D3D9_Draw_DebugChar (qbyte num);
-void					D3D9_Draw_EditorBackground (int lines);
-void					D3D9_Draw_Image (float x, float y, float w, float h, float s1, float t1, float s2, float t2, mpic_t *pic);
-void					D3D9_Draw_ImageColours (float r, float g, float b, float a);
-mpic_t*					D3D9_Draw_SafeCachePic (char *path);
-mpic_t*					D3D9_Draw_SafePicFromWad (char *name);
-void					D3D9_Draw_ScalePic (int x, int y, int width, int height, mpic_t *pic);
-void					D3D9_Draw_String (int x, int y, const qbyte *str);
-void					D3D9_Draw_SubPic (int x, int y, int width, int height, mpic_t *pic, int srcx, int srcy, int srcwidth, int srcheight);
-void					D3D9_Draw_TileClear (int x, int y, int w, int h);
-void					D3D9_InitParticleTexture (void);
-LPDIRECT3DBASETEXTURE9	D3D9_LoadTexture_32 (char *name, unsigned int *data, int width, int height, int flags);
-LPDIRECT3DBASETEXTURE9	D3D9_LoadTexture_8_Pal24 (char *name, unsigned char *data, int width, int height, int flags, unsigned char *palette, int transparentpix);
-LPDIRECT3DBASETEXTURE9	D3D9_LoadTexture_8_Pal32 (char *name, unsigned char *data, int width, int height, int flags, unsigned char *palette);
-void					D3D9_Media_ShowFrame8bit (qbyte *framedata, int inwidth, int inheight, qbyte *palette);
-void					D3D9_Media_ShowFrameBGR_24_Flip	(qbyte *framedata, int inwidth, int inheight);
-void					D3D9_Media_ShowFrameRGBA_32 (qbyte *framedata, int inwidth, int inheight);
-void					D3D9_MipMap (qbyte *out, qbyte *in, int width, int height);
-void					D3D9_RoundDimensions (int *scaled_width, int *scaled_height, qboolean mipmap);
-void					D3D9_UnloadTexture (LPDIRECT3DBASETEXTURE9 tex);
-static void				Upload_Texture_32(LPDIRECT3DTEXTURE9 surf, unsigned int *data, int width, int height);
-
-//
-// d3d9_mesh.c
-//
-void					D3D9_DrawAliasModel (void);
-void					D3D9_DrawMesh (mesh_t *mesh);
-void					d3d9_GAliasFlushSkinCache (void);
-static void				LotsOfLightDirectionHacks (entity_t *e, model_t *m, vec3_t lightaxis[3]);
-
-//
-// d3d9_rmain.c
-//
-void					D3D9_BaseBModelTextures (entity_t *e);
-/*
-void					D3D9_DrawParticleBeam (beamseg_t *b, part_type_t *type);
-void					D3D9_DrawParticleBeamUT (beamseg_t *b, part_type_t *type);
-void					D3D9_DrawParticleBlob (particle_t *p, part_type_t *type);
-void					D3D9_DrawParticleSpark (particle_t *p, part_type_t *type);
-*/
-void					D3D9_DrawParticles (float ptime);
-static void				D3D9_DrawSpriteModel (entity_t *e);
-void					D3D9_DrawTextureChains (void);
-void					D3D9_DrawWorld (void);
-void					D3D9_R_DrawEntitiesOnList (void);
-void					D3D9_R_ReInit (void);
-void					D3D9_R_RenderScene (void);
-static void				D3D9_RecursiveQ2WorldNode (mnode_t *node);
-static void				D3D9_RecursiveWorldNode (mnode_t *node);
-void					D3D9_SetupFrame (void);
-qboolean				D3D9_ShouldDraw (void);
-void					D3D9R_DrawSprite(int count, void **e, void *parm);
-void					IDirect3DDevice9_DrawIndexedPrimitive7 (LPDIRECT3DDEVICE9 pD3DDev9, int mode, int fvf, void *verts, int numverts, index_t *indicies, int numindicies, int wasted);
-
-//
-// d3d9_rsurf.c
-//
-int						D3D9_AllocBlock (int w, int h, int *x, int *y);
-void					D3D9_BuildLightmaps (void);
-void					D3D9_BuildSurfaceDisplayList (msurface_t *fa);
-void					D3D9_CreateSurfaceLightmap (msurface_t *surf, int shift);
-void					D3D9_DrawSkyMesh(int pass, int texture, void *verts, int numverts, void *indicies, int numelements);
-int						D3D9_FillBlock (int texnum, int w, int h, int x, int y);
-LPDIRECT3DTEXTURE9		D3D9_NewLightmap (void);
-//void					D3D9R_BuildLightMap (msurface_t *surf, qbyte *dest, qbyte *deluxdest, stmap *stainsrc, int shift);
-void					D3D9R_RenderDynamicLightmaps (msurface_t *fa, int shift);
-
-//
-// vid_d3d9.c
-//
-void					D3D9_D_BeginDirectRect (int x, int y, qbyte *pbitmap, int width, int height);
-void					D3D9_D_EndDirectRect (int x, int y, int width, int height);
-void					D3D9_Mod_ClearAll (void);
-void*					D3D9_Mod_Extradata (struct model_s *mod);
-struct model_s*			D3D9_Mod_FindName (char *name);
-struct model_s*			D3D9_Mod_ForName (char *name, qboolean crash);
-void					D3D9_Mod_Init (void);
-void					D3D9_Mod_NowLoadExternal (void);
-int						D3D9_Mod_SkinForName (struct model_s *model, char *name);
-void					D3D9_Mod_Think (void);
-void					D3D9_Mod_TouchModel (char *name);
-qboolean				D3D9_R_CheckSky (void);
-void					D3D9_Set2D (void);
-void					D3D9_VID_ForceLockState (int lk);
-int						D3D9_VID_ForceUnlockedAndReturnState (void);
-void					D3D9_VID_LockBuffer (void);
-void					D3D9_VID_UnlockBuffer (void);
-static LRESULT WINAPI	D3D9_WindowProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-texid_t D3D9_LoadTexture			(char *identifier, int width, int height, enum uploadfmt fmt, void *data, unsigned int flags);
-texid_t D3D9_LoadTexture8Pal24	(char *identifier, int width, int height, qbyte *data, qbyte *palette24, unsigned int flags);
-texid_t D3D9_LoadTexture8Pal32	(char *identifier, int width, int height, qbyte *data, qbyte *palette32, unsigned int flags);
-texid_t D3D9_LoadCompressed		(char *name);
-texid_t D3D9_FindTexture			(char *identifier);
-texid_t D3D9_AllocNewTexture		(int w, int h);
-void    D3D9_Upload				(texid_t tex, char *name, enum uploadfmt fmt, void *data, void *palette, int width, int height, unsigned int flags);
-void    D3D9_DestroyTexture		(texid_t tex);
-
-extern LPDIRECT3DDEVICE9 pD3DDev9;
-
-extern int		d_lightstylevalue[256];	// 8.8 fraction of base light value
-
-#define lightmap_bytes 4
-
-
-extern int numlightmaps;
-
-extern mvertex_t *r_pcurrentvertbase;
-
-#ifndef LMBLOCK_WIDTH
-#define LMBLOCK_WIDTH 128
-#define LMBLOCK_HEIGHT LMBLOCK_WIDTH
-typedef struct glRect_s {
-	unsigned char l,t,w,h;
-} glRect_t;
-typedef unsigned char stmap;
-
-typedef struct {
-	qboolean	modified;
-	qboolean	deluxmodified;
-	glRect_t	rectchange;
-	glRect_t	deluxrectchange;
-	int allocated[LMBLOCK_WIDTH];
-	qbyte		lightmaps[4*LMBLOCK_WIDTH*LMBLOCK_HEIGHT];
-	qbyte		deluxmaps[4*LMBLOCK_WIDTH*LMBLOCK_HEIGHT];	//fixme: make seperate structure for easy disabling with less memory usage.
-	stmap		stainmaps[3*LMBLOCK_WIDTH*LMBLOCK_HEIGHT];	//rgb no a. added to lightmap for added (hopefully) speed.
-} lightmapinfo_t;
-#endif
-
-extern LPDIRECT3DTEXTURE9 *lightmap_d3d9textures;
-extern LPDIRECT3DTEXTURE9 *deluxmap_d3d9textures;
-extern lightmapinfo_t **lightmap;
-
-extern void *d3dexplosiontexture;
-extern void *d3dballtexture;
-
-extern index_t dummyindex;
-#if sizeof_index_t == 2
-	#define D3DFMT_QINDEX D3DFMT_INDEX16
-#else
-	#define D3DFMT_QINDEX D3DFMT_INDEX32
-#endif
-
-#endif
+#ifdef MINGW
+	#include    "ddraw.h" // resolve DDLOCK_NOSYSLOCK
+#endif
+
+#ifndef D3D9QUAKE_H
+#define D3D9QUAKE_H
+
+
+#include "d3d9.h"
+#include "com_mesh.h"
+#include "glquake.h"
+
+//
+// d3d9_draw.c
+//
+void					D3D9_Draw_Alt_String (int x, int y, const qbyte *str);
+mpic_t*					D3D9_Draw_CachePic (char *path);
+void					D3D9_Draw_Character (int x, int y, unsigned int num);
+void					D3D9_Draw_ColouredCharacter (int x, int y, unsigned int num);
+void					D3D9_Draw_ConsoleBackground	(int firstline, int lastline, qboolean forceopaque);
+void					D3D9_Draw_DebugChar (qbyte num);
+void					D3D9_Draw_EditorBackground (int lines);
+void					D3D9_Draw_Image (float x, float y, float w, float h, float s1, float t1, float s2, float t2, mpic_t *pic);
+void					D3D9_Draw_ImageColours (float r, float g, float b, float a);
+mpic_t*					D3D9_Draw_SafeCachePic (char *path);
+mpic_t*					D3D9_Draw_SafePicFromWad (char *name);
+void					D3D9_Draw_ScalePic (int x, int y, int width, int height, mpic_t *pic);
+void					D3D9_Draw_String (int x, int y, const qbyte *str);
+void					D3D9_Draw_SubPic (int x, int y, int width, int height, mpic_t *pic, int srcx, int srcy, int srcwidth, int srcheight);
+void					D3D9_Draw_TileClear (int x, int y, int w, int h);
+void					D3D9_InitParticleTexture (void);
+LPDIRECT3DBASETEXTURE9	D3D9_LoadTexture_32 (char *name, unsigned int *data, int width, int height, int flags);
+LPDIRECT3DBASETEXTURE9	D3D9_LoadTexture_8_Pal24 (char *name, unsigned char *data, int width, int height, int flags, unsigned char *palette, int transparentpix);
+LPDIRECT3DBASETEXTURE9	D3D9_LoadTexture_8_Pal32 (char *name, unsigned char *data, int width, int height, int flags, unsigned char *palette);
+void					D3D9_Media_ShowFrame8bit (qbyte *framedata, int inwidth, int inheight, qbyte *palette);
+void					D3D9_Media_ShowFrameBGR_24_Flip	(qbyte *framedata, int inwidth, int inheight);
+void					D3D9_Media_ShowFrameRGBA_32 (qbyte *framedata, int inwidth, int inheight);
+void					D3D9_MipMap (qbyte *out, qbyte *in, int width, int height);
+void					D3D9_RoundDimensions (int *scaled_width, int *scaled_height, qboolean mipmap);
+void					D3D9_UnloadTexture (LPDIRECT3DBASETEXTURE9 tex);
+static void				Upload_Texture_32(LPDIRECT3DTEXTURE9 surf, unsigned int *data, int width, int height);
+
+//
+// d3d9_mesh.c
+//
+void					D3D9_DrawAliasModel (void);
+void					D3D9_DrawMesh (mesh_t *mesh);
+void					d3d9_GAliasFlushSkinCache (void);
+static void				LotsOfLightDirectionHacks (entity_t *e, model_t *m, vec3_t lightaxis[3]);
+
+//
+// d3d9_rmain.c
+//
+void					D3D9_BaseBModelTextures (entity_t *e);
+/*
+void					D3D9_DrawParticleBeam (beamseg_t *b, part_type_t *type);
+void					D3D9_DrawParticleBeamUT (beamseg_t *b, part_type_t *type);
+void					D3D9_DrawParticleBlob (particle_t *p, part_type_t *type);
+void					D3D9_DrawParticleSpark (particle_t *p, part_type_t *type);
+*/
+void					D3D9_DrawParticles (float ptime);
+static void				D3D9_DrawSpriteModel (entity_t *e);
+void					D3D9_DrawTextureChains (void);
+void					D3D9_DrawWorld (void);
+void					D3D9_R_DrawEntitiesOnList (void);
+void					D3D9_R_ReInit (void);
+void					D3D9_R_RenderScene (void);
+static void				D3D9_RecursiveQ2WorldNode (mnode_t *node);
+static void				D3D9_RecursiveWorldNode (mnode_t *node);
+void					D3D9_SetupFrame (void);
+qboolean				D3D9_ShouldDraw (void);
+void					D3D9R_DrawSprite(int count, void **e, void *parm);
+void					IDirect3DDevice9_DrawIndexedPrimitive7 (LPDIRECT3DDEVICE9 pD3DDev9, int mode, int fvf, void *verts, int numverts, index_t *indicies, int numindicies, int wasted);
+
+//
+// d3d9_rsurf.c
+//
+int						D3D9_AllocBlock (int w, int h, int *x, int *y);
+void					D3D9_BuildLightmaps (void);
+void					D3D9_BuildSurfaceDisplayList (msurface_t *fa);
+void					D3D9_CreateSurfaceLightmap (msurface_t *surf, int shift);
+void					D3D9_DrawSkyMesh(int pass, int texture, void *verts, int numverts, void *indicies, int numelements);
+int						D3D9_FillBlock (int texnum, int w, int h, int x, int y);
+LPDIRECT3DTEXTURE9		D3D9_NewLightmap (void);
+//void					D3D9R_BuildLightMap (msurface_t *surf, qbyte *dest, qbyte *deluxdest, stmap *stainsrc, int shift);
+void					D3D9R_RenderDynamicLightmaps (msurface_t *fa, int shift);
+
+//
+// vid_d3d9.c
+//
+void					D3D9_D_BeginDirectRect (int x, int y, qbyte *pbitmap, int width, int height);
+void					D3D9_D_EndDirectRect (int x, int y, int width, int height);
+void					D3D9_Mod_ClearAll (void);
+void*					D3D9_Mod_Extradata (struct model_s *mod);
+struct model_s*			D3D9_Mod_FindName (char *name);
+struct model_s*			D3D9_Mod_ForName (char *name, qboolean crash);
+void					D3D9_Mod_Init (void);
+void					D3D9_Mod_NowLoadExternal (void);
+int						D3D9_Mod_SkinForName (struct model_s *model, char *name);
+void					D3D9_Mod_Think (void);
+void					D3D9_Mod_TouchModel (char *name);
+qboolean				D3D9_R_CheckSky (void);
+void					D3D9_Set2D (void);
+void					D3D9_VID_ForceLockState (int lk);
+int						D3D9_VID_ForceUnlockedAndReturnState (void);
+void					D3D9_VID_LockBuffer (void);
+void					D3D9_VID_UnlockBuffer (void);
+static LRESULT WINAPI	D3D9_WindowProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+texid_t D3D9_LoadTexture			(char *identifier, int width, int height, enum uploadfmt fmt, void *data, unsigned int flags);
+texid_t D3D9_LoadTexture8Pal24	(char *identifier, int width, int height, qbyte *data, qbyte *palette24, unsigned int flags);
+texid_t D3D9_LoadTexture8Pal32	(char *identifier, int width, int height, qbyte *data, qbyte *palette32, unsigned int flags);
+texid_t D3D9_LoadCompressed		(char *name);
+texid_t D3D9_FindTexture			(char *identifier);
+texid_t D3D9_AllocNewTexture		(int w, int h);
+void    D3D9_Upload				(texid_t tex, char *name, enum uploadfmt fmt, void *data, void *palette, int width, int height, unsigned int flags);
+void    D3D9_DestroyTexture		(texid_t tex);
+
+extern LPDIRECT3DDEVICE9 pD3DDev9;
+
+extern int		d_lightstylevalue[256];	// 8.8 fraction of base light value
+
+#define lightmap_bytes 4
+
+
+extern int numlightmaps;
+
+extern mvertex_t *r_pcurrentvertbase;
+
+#ifndef LMBLOCK_WIDTH
+#define LMBLOCK_WIDTH 128
+#define LMBLOCK_HEIGHT LMBLOCK_WIDTH
+typedef struct glRect_s {
+	unsigned char l,t,w,h;
+} glRect_t;
+typedef unsigned char stmap;
+
+typedef struct {
+	qboolean	modified;
+	qboolean	deluxmodified;
+	glRect_t	rectchange;
+	glRect_t	deluxrectchange;
+	int allocated[LMBLOCK_WIDTH];
+	qbyte		lightmaps[4*LMBLOCK_WIDTH*LMBLOCK_HEIGHT];
+	qbyte		deluxmaps[4*LMBLOCK_WIDTH*LMBLOCK_HEIGHT];	//fixme: make seperate structure for easy disabling with less memory usage.
+	stmap		stainmaps[3*LMBLOCK_WIDTH*LMBLOCK_HEIGHT];	//rgb no a. added to lightmap for added (hopefully) speed.
+} lightmapinfo_t;
+#endif
+
+extern LPDIRECT3DTEXTURE9 *lightmap_d3d9textures;
+extern LPDIRECT3DTEXTURE9 *deluxmap_d3d9textures;
+extern lightmapinfo_t **lightmap;
+
+extern void *d3dexplosiontexture;
+extern void *d3dballtexture;
+
+extern index_t dummyindex;
+#if sizeof_index_t == 2
+	#define D3DFMT_QINDEX D3DFMT_INDEX16
+#else
+	#define D3DFMT_QINDEX D3DFMT_INDEX32
+#endif
+
+#endif