X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=81e5104446b0a73d0a41ea1c29890c9cef3dd425;hb=929f9a6fe217e9c8ca40a68a5229b08400233946;hp=00ad39b3da8331960247ffa53dff9befbee75446;hpb=d57be67cb00229acb8564b92c8b7c58eeed8a0cb;p=xonotic%2Fdarkplaces.git

diff --git a/gl_textures.c b/gl_textures.c
index 00ad39b3..81e51044 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -1,7 +1,8 @@
 #include "quakedef.h"
 
-cvar_t	r_max_size = {0, "r_max_size", "2048"};
-cvar_t	r_picmip = {0, "r_picmip", "0"};
+cvar_t	r_max_size = {CVAR_SAVE, "r_max_size", "2048"};
+cvar_t	r_max_scrapsize = {CVAR_SAVE, "r_max_scrapsize", "256"};
+cvar_t	r_picmip = {CVAR_SAVE, "r_picmip", "0"};
 cvar_t	r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1"};
 cvar_t	r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1"};
 
@@ -10,6 +11,8 @@ int		gl_filter_mag = GL_LINEAR;
 
 
 static mempool_t *texturemempool;
+static mempool_t *texturedatamempool;
+static mempool_t *textureprocessingmempool;
 
 // note: this must not conflict with TEXF_ flags in r_textures.h
 // cleared when a texture is uploaded
@@ -22,14 +25,15 @@ static mempool_t *texturemempool;
 #define GLTEXF_DESTROYED 0x00040000
 
 // size of images which hold fragment textures, ignores picmip and max_size
-#define BLOCK_SIZE 256
+//#define BLOCK_SIZE 256
+static int block_size;
 
 // really this number only governs gltexnuminuse
 #define MAX_GLTEXTURES 65536
 
 // since there is only one set of GL texture numbers, we have to track them
 // globally, everything else is per texture pool
-static byte *gltexnuminuse;
+static qbyte *gltexnuminuse;
 
 typedef struct
 {
@@ -82,16 +86,16 @@ typedef struct gltexture_s
 	// location in the image, and size
 	int x, y, width, height;
 	// copy of the original texture supplied to the upload function, for re-uploading or deferred uploads (non-precached)
-	byte *inputtexels;
+	qbyte *inputtexels;
 	// to identify cache mismatchs (this might be removed someday)
 	int crc;
 	// flags supplied to the LoadTexture/ProceduralTexture functions
 	// (might be altered to remove TEXF_ALPHA), and GLTEXF_ private flags
 	int flags;
 	// procedural texture generation function, called once per frame if the texture is used
-	int (*generate)(byte *buffer, int width, int height, void *parameterdata, int parameterdatasize);
+	int (*generate)(qbyte *buffer, int width, int height, void *parameterdata, int parameterdatasize);
 	// data provided to generate, persistent from call to call
-	byte *proceduraldata;
+	qbyte *proceduraldata;
 	// size of data
 	int proceduraldatasize;
 	// used only to avoid updating the texture more than once per frame
@@ -114,11 +118,9 @@ gltexturepool_t;
 
 static gltexturepool_t *gltexturepoolchain = NULL;
 
-static byte *resamplerow1 = NULL, *resamplerow2 = NULL;
-static int resamplerowsize = 0;
-static byte *resizebuffer = NULL, *colorconvertbuffer;
+static qbyte *resizebuffer = NULL, *colorconvertbuffer;
 static int resizebuffersize = 0;
-static byte *texturebuffer;
+static qbyte *texturebuffer;
 static int texturebuffersize = 0;
 
 static int realmaxsize = 0;
@@ -204,11 +206,14 @@ static void R_FreeTexture(gltexture_t *glt)
 	gltextureimage_t *image, **gltimagepointer;
 	GLuint texnum;
 
+	if (glt == NULL)
+		Host_Error("R_FreeTexture: texture == NULL\n");
+
 	for (gltpointer = &glt->pool->gltchain;*gltpointer && *gltpointer != glt;gltpointer = &(*gltpointer)->chain);
 	if (*gltpointer == glt)
 		*gltpointer = glt->chain;
 	else
-		Host_Error("R_FreeTexture: texture not linked in pool\n");
+		Host_Error("R_FreeTexture: texture \"%s\" not linked in pool\n", glt->identifier);
 
 	// note: if freeing a fragment texture, this will not make the claimed
 	// space available for new textures unless all other fragments in the
@@ -226,7 +231,7 @@ static void R_FreeTexture(gltexture_t *glt)
 		{
 			texnum = image->texnum;
 			gltexnuminuse[image->texnum] = 0;
-			glDeleteTextures(1, &texnum);
+			qglDeleteTextures(1, &texnum);
 		}
 		if (image->blockallocation)
 			Mem_Free(image->blockallocation);
@@ -259,6 +264,8 @@ static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier)
 rtexturepool_t *R_AllocTexturePool(void)
 {
 	gltexturepool_t *pool;
+	if (texturemempool == NULL)
+		return NULL;
 	pool = Mem_Alloc(texturemempool, sizeof(gltexturepool_t));
 	if (pool == NULL)
 		return NULL;
@@ -287,6 +294,8 @@ void R_FreeTexturePool(rtexturepool_t **rtexturepool)
 		Host_Error("R_FreeTexturePool: pool not linked\n");
 	while (pool->gltchain)
 		R_FreeTexture(pool->gltchain);
+	if (pool->imagechain)
+		Sys_Error("R_FreeTexturePool: not all images freed\n");
 	Mem_Free(pool);
 }
 
@@ -308,6 +317,8 @@ static glmode_t modes[] =
 	{"GL_LINEAR_MIPMAP_LINEAR", GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR}
 };
 
+extern int gl_backend_rebindtextures;
+
 static void GL_TextureMode_f (void)
 {
 	int i;
@@ -349,15 +360,16 @@ static void GL_TextureMode_f (void)
 			// only update already uploaded images
 			if (!(image->flags & GLTEXF_UPLOAD))
 			{
-				glBindTexture(GL_TEXTURE_2D, image->texnum);
+				qglBindTexture(GL_TEXTURE_2D, image->texnum);
 				if (image->flags & TEXF_MIPMAP)
-					glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+					qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
 				else
-					glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
-				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+					qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+				qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
 			}
 		}
 	}
+	gl_backend_rebindtextures = true;
 }
 
 static int R_CalcTexelDataSize (gltexture_t *glt)
@@ -370,12 +382,10 @@ static int R_CalcTexelDataSize (gltexture_t *glt)
 		if (r_max_size.integer > realmaxsize)
 			Cvar_SetValue("r_max_size", realmaxsize);
 		// calculate final size
-		width2 = 1;while (width2 < glt->width) width2 <<= 1;
-		height2 = 1;while (height2 < glt->height) height2 <<= 1;
-		width2 >>= (int) r_picmip.integer;
-		height2 >>= (int) r_picmip.integer;
-		while (width2 > (int) r_max_size.integer) width2 >>= 1;
-		while (height2 > (int) r_max_size.integer) height2 >>= 1;
+		for (width2 = 1;width2 < glt->width;width2 <<= 1);
+		for (height2 = 1;height2 < glt->height;height2 <<= 1);
+		for (width2 >>= r_picmip.integer;width2 > r_max_size.integer;width2 >>= 1);
+		for (height2 >>= r_picmip.integer;height2 > r_max_size.integer;height2 >>= 1);
 		if (width2 < 1) width2 = 1;
 		if (height2 < 1) height2 = 1;
 
@@ -452,10 +462,15 @@ char engineversion[40];
 static void r_textures_start(void)
 {
 	// deal with size limits of various drivers (3dfx in particular)
-	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &realmaxsize);
+	qglGetIntegerv(GL_MAX_TEXTURE_SIZE, &realmaxsize);
 	CHECKGLERROR
 
-	texturemempool = Mem_AllocPool("Textures");
+	// use the largest scrap texture size we can (not sure if this is really a good idea)
+	for (block_size = 1;block_size < realmaxsize && block_size < r_max_scrapsize.integer;block_size <<= 1);
+
+	texturemempool = Mem_AllocPool("Texture Info");
+	texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)");
+	textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers");
 	gltexnuminuse = Mem_Alloc(texturemempool, MAX_GLTEXTURES);
 	//memset(gltexnuminuse, 0, MAX_GLTEXTURES);
 }
@@ -472,21 +487,18 @@ static void r_textures_shutdown(void)
 	/*
 	if (resizebuffer) Mem_Free(resizebuffer);resizebuffer = NULL;
 	if (colorconvertbuffer) Mem_Free(colorconvertbuffer);colorconvertbuffer = NULL;
-	if (resamplerow1) Mem_Free(resamplerow1);resamplerow1 = NULL;
-	if (resamplerow2) Mem_Free(resamplerow2);resamplerow2 = NULL;
 	if (texturebuffer) Mem_Free(texturebuffer);texturebuffer = NULL;
 	if (gltexnuminuse) Mem_Free(gltexnuminuse);gltexnuminuse = NULL;
 	*/
 	resizebuffersize = 0;
-	resamplerowsize = 0;
 	texturebuffersize = 0;
 	resizebuffer = NULL;
 	colorconvertbuffer = NULL;
-	resamplerow1 = NULL;
-	resamplerow2 = NULL;
 	texturebuffer = NULL;
 	gltexnuminuse = NULL;
 	Mem_FreePool(&texturemempool);
+	Mem_FreePool(&texturedatamempool);
+	Mem_FreePool(&textureprocessingmempool);
 }
 
 static void r_textures_newmap(void)
@@ -497,6 +509,7 @@ void R_Textures_Init (void)
 {
 	Cmd_AddCommand ("gl_texturemode", &GL_TextureMode_f);
 	Cmd_AddCommand("r_texturestats", R_TextureStats_f);
+	Cvar_RegisterVariable (&r_max_scrapsize);
 	Cvar_RegisterVariable (&r_max_size);
 	Cvar_RegisterVariable (&r_picmip);
 	Cvar_RegisterVariable (&r_lerpimages);
@@ -506,485 +519,17 @@ void R_Textures_Init (void)
 	R_RegisterModule("R_Textures", r_textures_start, r_textures_shutdown, r_textures_newmap);
 }
 
-static void R_ResampleTextureLerpLine (byte *in, byte *out, int inwidth, int outwidth, int bytesperpixel)
-{
-	int		j, xi, oldx = 0, f, fstep, endx, lerp;
-	fstep = (int) (inwidth*65536.0f/outwidth);
-	endx = (inwidth-1);
-	if (bytesperpixel == 4)
-	{
-		for (j = 0,f = 0;j < outwidth;j++, f += fstep)
-		{
-			xi = f >> 16;
-			if (xi != oldx)
-			{
-				in += (xi - oldx) * 4;
-				oldx = xi;
-			}
-			if (xi < endx)
-			{
-				lerp = f & 0xFFFF;
-				*out++ = (byte) ((((in[4] - in[0]) * lerp) >> 16) + in[0]);
-				*out++ = (byte) ((((in[5] - in[1]) * lerp) >> 16) + in[1]);
-				*out++ = (byte) ((((in[6] - in[2]) * lerp) >> 16) + in[2]);
-				*out++ = (byte) ((((in[7] - in[3]) * lerp) >> 16) + in[3]);
-			}
-			else // last pixel of the line has no pixel to lerp to
-			{
-				*out++ = in[0];
-				*out++ = in[1];
-				*out++ = in[2];
-				*out++ = in[3];
-			}
-		}
-	}
-	else if (bytesperpixel == 3)
-	{
-		for (j = 0,f = 0;j < outwidth;j++, f += fstep)
-		{
-			xi = f >> 16;
-			if (xi != oldx)
-			{
-				in += (xi - oldx) * 3;
-				oldx = xi;
-			}
-			if (xi < endx)
-			{
-				lerp = f & 0xFFFF;
-				*out++ = (byte) ((((in[3] - in[0]) * lerp) >> 16) + in[0]);
-				*out++ = (byte) ((((in[4] - in[1]) * lerp) >> 16) + in[1]);
-				*out++ = (byte) ((((in[5] - in[2]) * lerp) >> 16) + in[2]);
-			}
-			else // last pixel of the line has no pixel to lerp to
-			{
-				*out++ = in[0];
-				*out++ = in[1];
-				*out++ = in[2];
-			}
-		}
-	}
-	else
-		Sys_Error("R_ResampleTextureLerpLine: unsupported bytesperpixel %i\n", bytesperpixel);
-}
-
-/*
-================
-R_ResampleTexture
-================
-*/
-static void R_ResampleTexture (void *indata, int inwidth, int inheight, void *outdata,  int outwidth, int outheight, int bytesperpixel)
-{
-	if (resamplerowsize < outwidth*4)
-	{
-		if (resamplerow1)
-			Mem_Free(resamplerow1);
-		if (resamplerow2)
-			Mem_Free(resamplerow2);
-		resamplerowsize = outwidth*4;
-		resamplerow1 = Mem_Alloc(texturemempool, resamplerowsize);
-		resamplerow2 = Mem_Alloc(texturemempool, resamplerowsize);
-	}
-#define row1 resamplerow1
-#define row2 resamplerow2
-	if (bytesperpixel == 4)
-	{
-		if (r_lerpimages.integer)
-		{
-			int		i, j, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth4 = inwidth*4, outwidth4 = outwidth*4;
-			byte	*inrow, *out;
-			out = outdata;
-			fstep = (int) (inheight*65536.0f/outheight);
-
-			inrow = indata;
-			oldy = 0;
-			R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
-			R_ResampleTextureLerpLine (inrow + inwidth4, row2, inwidth, outwidth, bytesperpixel);
-			for (i = 0, f = 0;i < outheight;i++,f += fstep)
-			{
-				yi = f >> 16;
-				if (yi < endy)
-				{
-					lerp = f & 0xFFFF;
-					if (yi != oldy)
-					{
-						inrow = (byte *)indata + inwidth4*yi;
-						if (yi == oldy+1)
-							memcpy(row1, row2, outwidth4);
-						else
-							R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
-						R_ResampleTextureLerpLine (inrow + inwidth4, row2, inwidth, outwidth, bytesperpixel);
-						oldy = yi;
-					}
-					j = outwidth - 4;
-					while(j >= 0)
-					{
-#define LERPBYTE(i) out[i] = (byte) ((((row2[i] - row1[i]) * lerp) >> 16) + row1[i])
-						LERPBYTE( 0);
-						LERPBYTE( 1);
-						LERPBYTE( 2);
-						LERPBYTE( 3);
-						LERPBYTE( 4);
-						LERPBYTE( 5);
-						LERPBYTE( 6);
-						LERPBYTE( 7);
-						LERPBYTE( 8);
-						LERPBYTE( 9);
-						LERPBYTE(10);
-						LERPBYTE(11);
-						LERPBYTE(12);
-						LERPBYTE(13);
-						LERPBYTE(14);
-						LERPBYTE(15);
-						out += 16;
-						row1 += 16;
-						row2 += 16;
-						j -= 4;
-					}
-					if (j & 2)
-					{
-						LERPBYTE( 0);
-						LERPBYTE( 1);
-						LERPBYTE( 2);
-						LERPBYTE( 3);
-						LERPBYTE( 4);
-						LERPBYTE( 5);
-						LERPBYTE( 6);
-						LERPBYTE( 7);
-						out += 8;
-						row1 += 8;
-						row2 += 8;
-					}
-					if (j & 1)
-					{
-						LERPBYTE( 0);
-						LERPBYTE( 1);
-						LERPBYTE( 2);
-						LERPBYTE( 3);
-						out += 4;
-						row1 += 4;
-						row2 += 4;
-					}
-					row1 -= outwidth4;
-					row2 -= outwidth4;
-				}
-				else
-				{
-					if (yi != oldy)
-					{
-						inrow = (byte *)indata + inwidth4*yi;
-						if (yi == oldy+1)
-							memcpy(row1, row2, outwidth4);
-						else
-							R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
-						oldy = yi;
-					}
-					memcpy(out, row1, outwidth4);
-				}
-			}
-		}
-		else
-		{
-			int i, j;
-			unsigned frac, fracstep;
-			// relies on int being 4 bytes
-			int *inrow, *out;
-			out = outdata;
-
-			fracstep = inwidth*0x10000/outwidth;
-			for (i = 0;i < outheight;i++)
-			{
-				inrow = (int *)indata + inwidth*(i*inheight/outheight);
-				frac = fracstep >> 1;
-				j = outwidth - 4;
-				while (j >= 0)
-				{
-					out[0] = inrow[frac >> 16];frac += fracstep;
-					out[1] = inrow[frac >> 16];frac += fracstep;
-					out[2] = inrow[frac >> 16];frac += fracstep;
-					out[3] = inrow[frac >> 16];frac += fracstep;
-					out += 4;
-					j -= 4;
-				}
-				if (j & 2)
-				{
-					out[0] = inrow[frac >> 16];frac += fracstep;
-					out[1] = inrow[frac >> 16];frac += fracstep;
-					out += 2;
-				}
-				if (j & 1)
-				{
-					out[0] = inrow[frac >> 16];frac += fracstep;
-					out += 1;
-				}
-			}
-		}
-	}
-	else if (bytesperpixel == 3)
-	{
-		if (r_lerpimages.integer)
-		{
-			int		i, j, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3;
-			byte	*inrow, *out;
-			out = outdata;
-			fstep = (int) (inheight*65536.0f/outheight);
-
-			inrow = indata;
-			oldy = 0;
-			R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
-			R_ResampleTextureLerpLine (inrow + inwidth3, row2, inwidth, outwidth, bytesperpixel);
-			for (i = 0, f = 0;i < outheight;i++,f += fstep)
-			{
-				yi = f >> 16;
-				if (yi < endy)
-				{
-					lerp = f & 0xFFFF;
-					if (yi != oldy)
-					{
-						inrow = (byte *)indata + inwidth3*yi;
-						if (yi == oldy+1)
-							memcpy(row1, row2, outwidth3);
-						else
-							R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
-						R_ResampleTextureLerpLine (inrow + inwidth3, row2, inwidth, outwidth, bytesperpixel);
-						oldy = yi;
-					}
-					j = outwidth - 4;
-					while(j >= 0)
-					{
-#define LERPBYTE(i) out[i] = (byte) ((((row2[i] - row1[i]) * lerp) >> 16) + row1[i])
-						LERPBYTE( 0);
-						LERPBYTE( 1);
-						LERPBYTE( 2);
-						LERPBYTE( 3);
-						LERPBYTE( 4);
-						LERPBYTE( 5);
-						LERPBYTE( 6);
-						LERPBYTE( 7);
-						LERPBYTE( 8);
-						LERPBYTE( 9);
-						LERPBYTE(10);
-						LERPBYTE(11);
-						out += 12;
-						row1 += 12;
-						row2 += 12;
-						j -= 4;
-					}
-					if (j & 2)
-					{
-						LERPBYTE( 0);
-						LERPBYTE( 1);
-						LERPBYTE( 2);
-						LERPBYTE( 3);
-						LERPBYTE( 4);
-						LERPBYTE( 5);
-						out += 6;
-						row1 += 6;
-						row2 += 6;
-					}
-					if (j & 1)
-					{
-						LERPBYTE( 0);
-						LERPBYTE( 1);
-						LERPBYTE( 2);
-						out += 3;
-						row1 += 3;
-						row2 += 3;
-					}
-					row1 -= outwidth3;
-					row2 -= outwidth3;
-				}
-				else
-				{
-					if (yi != oldy)
-					{
-						inrow = (byte *)indata + inwidth3*yi;
-						if (yi == oldy+1)
-							memcpy(row1, row2, outwidth3);
-						else
-							R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
-						oldy = yi;
-					}
-					memcpy(out, row1, outwidth3);
-				}
-			}
-		}
-		else
-		{
-			int i, j, f, inwidth3 = inwidth * 3;
-			unsigned frac, fracstep;
-			byte *inrow, *out;
-			out = outdata;
-
-			fracstep = inwidth*0x10000/outwidth;
-			for (i = 0;i < outheight;i++)
-			{
-				inrow = indata + inwidth3*(i*inheight/outheight);
-				frac = fracstep >> 1;
-				j = outwidth - 4;
-				while (j >= 0)
-				{
-					f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-					f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-					f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-					f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-					j -= 4;
-				}
-				if (j & 2)
-				{
-					f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-					f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-					out += 2;
-				}
-				if (j & 1)
-				{
-					f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-					out += 1;
-				}
-			}
-		}
-	}
-	else
-		Sys_Error("R_ResampleTexture: unsupported bytesperpixel %i\n", bytesperpixel);
-#undef row1
-#undef row2
-}
-
-// in can be the same as out
-static void R_MipReduce(byte *in, byte *out, int *width, int *height, int destwidth, int destheight, int bytesperpixel)
-{
-	int x, y, nextrow;
-	nextrow = *width * bytesperpixel;
-	if (*width > destwidth)
-	{
-		*width >>= 1;
-		if (*height > destheight)
-		{
-			// reduce both
-			*height >>= 1;
-			if (bytesperpixel == 4)
-			{
-				for (y = 0;y < *height;y++)
-				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (byte) ((in[0] + in[4] + in[nextrow  ] + in[nextrow+4]) >> 2);
-						out[1] = (byte) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
-						out[2] = (byte) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2);
-						out[3] = (byte) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2);
-						out += 4;
-						in += 8;
-					}
-					in += nextrow; // skip a line
-				}
-			}
-			else if (bytesperpixel == 3)
-			{
-				for (y = 0;y < *height;y++)
-				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (byte) ((in[0] + in[3] + in[nextrow  ] + in[nextrow+3]) >> 2);
-						out[1] = (byte) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
-						out[2] = (byte) ((in[2] + in[5] + in[nextrow+2] + in[nextrow+5]) >> 2);
-						out += 3;
-						in += 6;
-					}
-					in += nextrow; // skip a line
-				}
-			}
-			else
-				Sys_Error("R_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
-		}
-		else
-		{
-			// reduce width
-			if (bytesperpixel == 4)
-			{
-				for (y = 0;y < *height;y++)
-				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (byte) ((in[0] + in[4]) >> 1);
-						out[1] = (byte) ((in[1] + in[5]) >> 1);
-						out[2] = (byte) ((in[2] + in[6]) >> 1);
-						out[3] = (byte) ((in[3] + in[7]) >> 1);
-						out += 4;
-						in += 8;
-					}
-				}
-			}
-			else if (bytesperpixel == 3)
-			{
-				for (y = 0;y < *height;y++)
-				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (byte) ((in[0] + in[3]) >> 1);
-						out[1] = (byte) ((in[1] + in[4]) >> 1);
-						out[2] = (byte) ((in[2] + in[5]) >> 1);
-						out += 3;
-						in += 6;
-					}
-				}
-			}
-			else
-				Sys_Error("R_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
-		}
-	}
-	else
-	{
-		if (*height > destheight)
-		{
-			// reduce height
-			*height >>= 1;
-			if (bytesperpixel == 4)
-			{
-				for (y = 0;y < *height;y++)
-				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (byte) ((in[0] + in[nextrow  ]) >> 1);
-						out[1] = (byte) ((in[1] + in[nextrow+1]) >> 1);
-						out[2] = (byte) ((in[2] + in[nextrow+2]) >> 1);
-						out[3] = (byte) ((in[3] + in[nextrow+3]) >> 1);
-						out += 4;
-						in += 4;
-					}
-					in += nextrow; // skip a line
-				}
-			}
-			else if (bytesperpixel == 3)
-			{
-				for (y = 0;y < *height;y++)
-				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (byte) ((in[0] + in[nextrow  ]) >> 1);
-						out[1] = (byte) ((in[1] + in[nextrow+1]) >> 1);
-						out[2] = (byte) ((in[2] + in[nextrow+2]) >> 1);
-						out += 3;
-						in += 3;
-					}
-					in += nextrow; // skip a line
-				}
-			}
-			else
-				Sys_Error("R_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
-		}
-		else
-			Sys_Error("R_MipReduce: desired size already achieved\n");
-	}
-}
-
-static void R_Upload(gltexture_t *glt, byte *data)
+static void R_Upload(gltexture_t *glt, qbyte *data)
 {
 	int mip, width, height, internalformat;
-	byte *prevbuffer;
+	qbyte *prevbuffer;
 	prevbuffer = data;
 
-	glBindTexture(GL_TEXTURE_2D, glt->image->texnum);
+	qglBindTexture(GL_TEXTURE_2D, glt->image->texnum);
 	CHECKGLERROR
 
+	gl_backend_rebindtextures = true;
+
 	glt->flags &= ~GLTEXF_UPLOAD;
 
 	if (glt->flags & TEXF_FRAGMENT)
@@ -996,21 +541,22 @@ static void R_Upload(gltexture_t *glt, byte *data)
 				Mem_Free(resizebuffer);
 			if (colorconvertbuffer)
 				Mem_Free(colorconvertbuffer);
-			resizebuffer = Mem_Alloc(texturemempool, resizebuffersize);
-			colorconvertbuffer = Mem_Alloc(texturemempool, resizebuffersize);
+			resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
+			colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
 			if (!resizebuffer || !colorconvertbuffer)
 				Host_Error("R_Upload: out of memory\n");
 		}
 
 		if (glt->image->flags & GLTEXF_UPLOAD)
 		{
+			Con_DPrintf("uploaded new fragments image\n");
 			glt->image->flags &= ~GLTEXF_UPLOAD;
 			memset(resizebuffer, 255, glt->image->width * glt->image->height * glt->image->bytesperpixel);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+			qglTexImage2D (GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
 			CHECKGLERROR
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+			qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
 			CHECKGLERROR
-			glTexImage2D (GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
+			qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
 			CHECKGLERROR
 		}
 
@@ -1027,7 +573,7 @@ static void R_Upload(gltexture_t *glt, byte *data)
 			prevbuffer = colorconvertbuffer;
 		}
 
-		glTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+		qglTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
 		CHECKGLERROR
 		return;
 	}
@@ -1035,8 +581,8 @@ static void R_Upload(gltexture_t *glt, byte *data)
 	glt->image->flags &= ~GLTEXF_UPLOAD;
 
 	// these are rounded up versions of the size to do better resampling
-	width = 1;while(width < glt->width) width *= 2;
-	height = 1;while(height < glt->height) height *= 2;
+	for (width = 1;width < glt->width;width <<= 1);
+	for (height = 1;height < glt->height;height <<= 1);
 
 	if (resizebuffersize < width * height * glt->image->bytesperpixel)
 	{
@@ -1045,8 +591,8 @@ static void R_Upload(gltexture_t *glt, byte *data)
 			Mem_Free(resizebuffer);
 		if (colorconvertbuffer)
 			Mem_Free(colorconvertbuffer);
-		resizebuffer = Mem_Alloc(texturemempool, resizebuffersize);
-		colorconvertbuffer = Mem_Alloc(texturemempool, resizebuffersize);
+		resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
+		colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
 		if (!resizebuffer || !colorconvertbuffer)
 			Host_Error("R_Upload: out of memory\n");
 	}
@@ -1070,14 +616,14 @@ static void R_Upload(gltexture_t *glt, byte *data)
 
 		if (glt->width != width || glt->height != height)
 		{
-			R_ResampleTexture(prevbuffer, glt->width, glt->height, resizebuffer, width, height, glt->image->bytesperpixel);
+			Image_Resample(prevbuffer, glt->width, glt->height, resizebuffer, width, height, glt->image->bytesperpixel, r_lerpimages.integer);
 			prevbuffer = resizebuffer;
 		}
 
 		// apply picmip/max_size limitations
 		while (width > glt->image->width || height > glt->image->height)
 		{
-			R_MipReduce(prevbuffer, resizebuffer, &width, &height, glt->image->width, glt->image->height, glt->image->bytesperpixel);
+			Image_MipReduce(prevbuffer, resizebuffer, &width, &height, glt->image->width, glt->image->height, glt->image->bytesperpixel);
 			prevbuffer = resizebuffer;
 		}
 	}
@@ -1088,29 +634,29 @@ static void R_Upload(gltexture_t *glt, byte *data)
 		internalformat = 4;
 
 	mip = 0;
-	glTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+	qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
 	CHECKGLERROR
 	if (glt->flags & TEXF_MIPMAP)
 	{
 		while (width > 1 || height > 1)
 		{
-			R_MipReduce(prevbuffer, resizebuffer, &width, &height, 1, 1, glt->image->bytesperpixel);
+			Image_MipReduce(prevbuffer, resizebuffer, &width, &height, 1, 1, glt->image->bytesperpixel);
 			prevbuffer = resizebuffer;
 
-			glTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+			qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
 			CHECKGLERROR
 		}
 
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+		qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
 		CHECKGLERROR
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+		qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
 		CHECKGLERROR
 	}
 	else
 	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+		qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
 		CHECKGLERROR
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+		qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
 		CHECKGLERROR
 	}
 }
@@ -1139,8 +685,8 @@ static void R_FindImageForTexture(gltexture_t *glt)
 				continue;
 
 			// got a fragments texture, find a place in it if we can
-			best = BLOCK_SIZE;
-			for (best = BLOCK_SIZE, i = 0;i < BLOCK_SIZE - w;i += texinfo->align)
+			best = block_size;
+			for (best = block_size, i = 0;i < block_size - w;i += texinfo->align)
 			{
 				for (best2 = 0, j = 0;j < w;j++)
 				{
@@ -1157,7 +703,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
 				}
 			}
 
-			if (best + h > BLOCK_SIZE)
+			if (best + h > block_size)
 				continue;
 
 			for (i = 0;i < w;i++)
@@ -1175,10 +721,10 @@ static void R_FindImageForTexture(gltexture_t *glt)
 			Sys_Error("R_FindImageForTexture: ran out of memory\n");
 		//memset(image, 0, sizeof(*image));
 		image->type = GLIMAGETYPE_FRAGMENTS;
-		image->width = BLOCK_SIZE;
-		image->height = BLOCK_SIZE;
-		image->blockallocation = Mem_Alloc(texturemempool, BLOCK_SIZE * sizeof(short));
-		memset(image->blockallocation, 0, BLOCK_SIZE * sizeof(short));
+		image->width = block_size;
+		image->height = block_size;
+		image->blockallocation = Mem_Alloc(texturemempool, block_size * sizeof(short));
+		memset(image->blockallocation, 0, block_size * sizeof(short));
 
 		x = 0;
 		y = 0;
@@ -1199,10 +745,10 @@ static void R_FindImageForTexture(gltexture_t *glt)
 		// calculate final size
 		if (r_max_size.integer > realmaxsize)
 			Cvar_SetValue("r_max_size", realmaxsize);
-		image->width = 1;while (image->width < glt->width) image->width <<= 1;
-		image->height = 1;while (image->height < glt->height) image->height <<= 1;
-		image->width >>= r_picmip.integer;while (image->width > r_max_size.integer) image->width >>= 1;
-		image->height >>= r_picmip.integer;while (image->height > r_max_size.integer) image->height >>= 1;
+		for (image->width = 1;image->width < glt->width;image->width <<= 1);
+		for (image->height = 1;image->height < glt->height;image->height <<= 1);
+		for (image->width >>= r_picmip.integer;image->width > r_max_size.integer;image->width >>= 1);
+		for (image->height >>= r_picmip.integer;image->height > r_max_size.integer;image->height >>= 1);
 		if (image->width < 1) image->width = 1;
 		if (image->height < 1) image->height = 1;
 	}
@@ -1240,7 +786,7 @@ static void R_UploadTexture (gltexture_t *glt)
 				if (texturebuffer)
 					Mem_Free(texturebuffer);
 				texturebuffersize = glt->width * glt->height * glt->textype->inputbytesperpixel;
-				texturebuffer = Mem_Alloc(texturemempool, texturebuffersize);
+				texturebuffer = Mem_Alloc(textureprocessingmempool, texturebuffersize);
 			}
 
 			glt->generate(texturebuffer, glt->width, glt->height, (void *)glt->proceduraldata, glt->proceduraldatasize);
@@ -1260,7 +806,7 @@ static void R_UploadTexture (gltexture_t *glt)
 	}
 }
 
-static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int crc, int width, int height, int flags, textypeinfo_t *texinfo, byte *data, int (*generate)(byte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize)
+static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int crc, int width, int height, int flags, textypeinfo_t *texinfo, qbyte *data, int (*generate)(qbyte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize)
 {
 	gltexture_t *glt;
 	glt = Mem_Alloc(texturemempool, sizeof(gltexture_t));
@@ -1283,7 +829,7 @@ static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int
 
 	if (data)
 	{
-		glt->inputtexels = Mem_Alloc(texturemempool, glt->width * glt->height * texinfo->inputbytesperpixel);
+		glt->inputtexels = Mem_Alloc(texturedatamempool, glt->width * glt->height * texinfo->inputbytesperpixel);
 		if (glt->inputtexels == NULL)
 			Sys_Error("R_SetupTexture: out of memory\n");
 		memcpy(glt->inputtexels, data, glt->width * glt->height * texinfo->inputbytesperpixel);
@@ -1313,7 +859,7 @@ static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int
 R_LoadTexture
 ================
 */
-rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, byte *data, int textype, int flags)
+rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags)
 {
 	int i;
 	gltexture_t *glt;
@@ -1332,8 +878,8 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
 
 	if (flags & TEXF_FRAGMENT)
 	{
-		if (width > BLOCK_SIZE || height > BLOCK_SIZE)
-			Host_Error("R_LoadTexture: fragment too big, must be no more than %dx%d\n", BLOCK_SIZE, BLOCK_SIZE);
+		if (width > block_size || height > block_size)
+			Host_Error("R_LoadTexture: fragment too big, must be no more than %dx%d\n", block_size, block_size);
 		if ((width * texinfo->internalbytesperpixel) & 3)
 			Host_Error("R_LoadTexture: incompatible width for fragment");
 	}
@@ -1387,7 +933,10 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
 	if (identifier && (glt = R_FindTexture(pool, identifier)))
 	{
 		if (crc == glt->crc && width == glt->width && height == glt->height && texinfo == glt->textype && ((flags ^ glt->flags) & TEXF_IMPORTANTBITS) == 0 && ((flags ^ glt->flags) & GLTEXF_IMPORTANTBITS) == 0)
+		{
+			Con_Printf("R_LoadTexture: exact match with existing texture %s\n", identifier);
 			return (rtexture_t *)glt; // exact match, use existing
+		}
 		Con_Printf("R_LoadTexture: cache mismatch on %s, replacing old texture\n", identifier);
 		R_FreeTexture(glt);
 	}
@@ -1395,7 +944,7 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
 	return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data, NULL, NULL, 0);
 }
 
-rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, int textype, int flags, int (*generate)(byte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize)
+rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, int textype, int flags, int (*generate)(qbyte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize)
 {
 	gltexture_t		*glt;
 	gltexturepool_t	*pool = (gltexturepool_t *)rtexturepool;
@@ -1411,8 +960,8 @@ rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier,
 //		Host_Error("R_ProceduralTexture: \"%s\" has no generate function\n", identifier);
 	if (flags & TEXF_FRAGMENT)
 	{
-		if (width > BLOCK_SIZE || height > BLOCK_SIZE)
-			Host_Error("R_ProceduralTexture: fragment too big, must be no more than %dx%d\n", BLOCK_SIZE, BLOCK_SIZE);
+		if (width > block_size || height > block_size)
+			Host_Error("R_ProceduralTexture: fragment too big, must be no more than %dx%d\n", block_size, block_size);
 		if ((width * texinfo->internalbytesperpixel) & 3)
 			Host_Error("R_ProceduralTexture: incompatible width for fragment");
 	}
@@ -1421,8 +970,11 @@ rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier,
 	if (identifier && (glt = R_FindTexture(pool, identifier)))
 	{
 		if (width == glt->width && height == glt->height && texinfo == glt->textype && ((flags ^ glt->flags) & TEXF_IMPORTANTBITS) == 0 && ((flags ^ glt->flags) & GLTEXF_IMPORTANTBITS) == 0)
+		{
+			Con_Printf("R_LoadTexture: exact match with existing texture %s\n", identifier);
 			return (rtexture_t *)glt; // exact match, use existing
-		Con_DPrintf("R_LoadTexture: cache mismatch, replacing old texture\n");
+		}
+		Con_Printf("R_LoadTexture: cache mismatch, replacing old texture\n");
 		R_FreeTexture(glt);
 	}
 
@@ -1452,12 +1004,31 @@ int R_TextureHeight(rtexture_t *rt)
 	return ((gltexture_t *)rt)->height;
 }
 
-void R_GetFragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
+void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
 {
 	gltexture_t *glt;
 	float iwidth, iheight;
+	if (cls.state == ca_dedicated)
+	{
+		if (x)
+			*x = 0;
+		if (y)
+			*y = 0;
+		if (fx1 || fy1 || fx2 || fy2)
+		{
+			if (fx1)
+				*fx1 = 0;
+			if (fy1)
+				*fy1 = 0;
+			if (fx2)
+				*fx2 = 1;
+			if (fy2)
+				*fy2 = 1;
+		}
+		return;
+	}
 	if (!rt)
-		Host_Error("R_GetFragmentLocation: no texture supplied\n");
+		Host_Error("R_FragmentLocation: no texture supplied\n");
 	glt = (gltexture_t *)rt;
 	if (glt->flags & TEXF_FRAGMENT)
 	{
@@ -1507,7 +1078,7 @@ int R_CompatibleFragmentWidth(int width, int textype, int flags)
 	return width;
 }
 
-void R_UpdateTexture(rtexture_t *rt, byte *data)
+void R_UpdateTexture(rtexture_t *rt, qbyte *data)
 {
 	gltexture_t *glt;
 	if (rt == NULL)
@@ -1515,16 +1086,23 @@ void R_UpdateTexture(rtexture_t *rt, byte *data)
 	if (data == NULL)
 		Host_Error("R_UpdateTexture: no data supplied\n");
 	glt = (gltexture_t *)rt;
+	/*
 	if (!(glt->flags & GLTEXF_PROCEDURAL))
 	{
 		if (glt->inputtexels == NULL)
 		{
-			glt->inputtexels = Mem_Alloc(texturemempool, glt->width * glt->height * glt->textype->inputbytesperpixel);
+			glt->inputtexels = Mem_Alloc(texturedatamempool, glt->width * glt->height * glt->textype->inputbytesperpixel);
 			if (glt->inputtexels == NULL)
 				Host_Error("R_UpdateTexture: ran out of memory\n");
 		}
 		memcpy(glt->inputtexels, data, glt->width * glt->height * glt->textype->inputbytesperpixel);
 	}
 	R_Upload(glt, data);
+	*/
+	// if it has not been uploaded yet, update the data that will be used when it is
+	if (glt->inputtexels)
+		memcpy(glt->inputtexels, data, glt->width * glt->height * glt->textype->inputbytesperpixel);
+	else
+		R_Upload(glt, data);
 }