X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_textures.c;h=8aa0457f31984dc5ad961b4e1026d3f58bbb4415;hp=50390ce9f99574d736ba9067bd465c172860db22;hb=051cbfa162b00e0820b50114e2b3366c9912018e;hpb=96b8df574ab1a9c2f08f6d8896e0e20635caa84d

diff --git a/gl_textures.c b/gl_textures.c
index 50390ce9..8aa0457f 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -1,3 +1,4 @@
+
 #include "quakedef.h"
 
 cvar_t	r_max_size = {CVAR_SAVE, "r_max_size", "2048"};
@@ -6,7 +7,7 @@ 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"};
 
-int		gl_filter_min = GL_LINEAR_MIPMAP_LINEAR; //NEAREST;
+int		gl_filter_min = GL_LINEAR_MIPMAP_LINEAR;
 int		gl_filter_mag = GL_LINEAR;
 
 
@@ -17,15 +18,12 @@ static mempool_t *textureprocessingmempool;
 // note: this must not conflict with TEXF_ flags in r_textures.h
 // cleared when a texture is uploaded
 #define GLTEXF_UPLOAD 0x00010000
-// texture generated by code, also causes permanent GLTEXF_UPLOAD effect
-#define GLTEXF_PROCEDURAL 0x00020000
 // bitmask for mismatch checking
-#define GLTEXF_IMPORTANTBITS (GLTEXF_PROCEDURAL)
+#define GLTEXF_IMPORTANTBITS (0)
 // set when image is uploaded and freed
 #define GLTEXF_DESTROYED 0x00040000
 
 // size of images which hold fragment textures, ignores picmip and max_size
-//#define BLOCK_SIZE 256
 static int block_size;
 
 // really this number only governs gltexnuminuse
@@ -33,7 +31,7 @@ static int block_size;
 
 // 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
 {
@@ -75,6 +73,10 @@ gltextureimage_t;
 
 typedef struct gltexture_s
 {
+	// this field is exposed to the R_GetTexture macro, for speed reasons
+	// (must be identical in rtexture_t)
+	int texnum; // GL texture slot number
+
 	// pointer to texturepool (check this to see if the texture is allocated)
 	struct gltexturepool_s *pool;
 	// pointer to next texture in texturepool chain
@@ -86,20 +88,12 @@ 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
+	// flags supplied to the LoadTexture function
 	// (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);
-	// data provided to generate, persistent from call to call
-	byte *proceduraldata;
-	// size of data
-	int proceduraldatasize;
-	// used only to avoid updating the texture more than once per frame
-	int proceduralframecount;
 	// pointer to one of the textype_ structs
 	textypeinfo_t *textype;
 }
@@ -118,11 +112,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;
@@ -180,39 +172,36 @@ static void R_PrecacheTexture(gltexture_t *glt)
 		R_UploadTexture(glt);
 }
 
-int R_GetTexture(rtexture_t *rt)
+int R_RealGetTexture(rtexture_t *rt)
 {
-	gltexture_t *glt;
-	if (!rt)
-		return 0;
-	glt = (gltexture_t *)rt;
-	if (glt->flags & (GLTEXF_UPLOAD | GLTEXF_PROCEDURAL))
+	if (rt)
 	{
-		if (glt->flags & GLTEXF_PROCEDURAL)
-		{
-			if (glt->proceduralframecount != r_framecount)
-			{
-				glt->proceduralframecount = r_framecount;
-				R_UploadTexture(glt);
-			}
-		}
-		else
+		gltexture_t *glt;
+		glt = (gltexture_t *)rt;
+		if (glt->flags & GLTEXF_UPLOAD)
 			R_UploadTexture(glt);
+		glt->texnum = glt->image->texnum;
+		return glt->image->texnum;
 	}
-	return glt->image->texnum;
+	else
+		return 0;
 }
 
-static void R_FreeTexture(gltexture_t *glt)
+void R_FreeTexture(rtexture_t *rt)
 {
-	gltexture_t **gltpointer;
+	gltexture_t *glt, **gltpointer;
 	gltextureimage_t *image, **gltimagepointer;
 	GLuint texnum;
 
+	glt = (gltexture_t *)rt;
+	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
@@ -230,7 +219,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);
@@ -241,8 +230,6 @@ static void R_FreeTexture(gltexture_t *glt)
 		Mem_Free(glt->identifier);
 	if (glt->inputtexels)
 		Mem_Free(glt->inputtexels);
-	if (glt->proceduraldata)
-		Mem_Free(glt->proceduraldata);
 	Mem_Free(glt);
 }
 
@@ -268,7 +255,6 @@ rtexturepool_t *R_AllocTexturePool(void)
 	pool = Mem_Alloc(texturemempool, sizeof(gltexturepool_t));
 	if (pool == NULL)
 		return NULL;
-	//memset(pool, 0, sizeof(gltexturepool_t));
 	pool->next = gltexturepoolchain;
 	gltexturepoolchain = pool;
 	pool->sentinel = TEXTUREPOOL_SENTINEL;
@@ -292,7 +278,7 @@ void R_FreeTexturePool(rtexturepool_t **rtexturepool)
 	else
 		Host_Error("R_FreeTexturePool: pool not linked\n");
 	while (pool->gltchain)
-		R_FreeTexture(pool->gltchain);
+		R_FreeTexture((rtexture_t *)pool->gltchain);
 	if (pool->imagechain)
 		Sys_Error("R_FreeTexturePool: not all images freed\n");
 	Mem_Free(pool);
@@ -316,6 +302,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;
@@ -357,15 +345,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)
@@ -443,10 +432,7 @@ static void R_TextureStats_f(void)
 		for (glt = pool->gltchain;glt;glt = glt->chain)
 		{
 			loaded = !(glt->flags & GLTEXF_UPLOAD);
-			if (glt->flags & GLTEXF_PROCEDURAL)
-				Con_Printf("%c%4i%c %4i  PROC %s %s %s %s\n"  , loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ',                               (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024,                                         loaded ? "loaded" : "      ", (glt->flags & TEXF_MIPMAP) ? "mip" : "   ", (glt->flags & TEXF_ALPHA) ? "alpha" : "     ", glt->identifier ? glt->identifier : "<unnamed>");
-			else
-				Con_Printf("%c%4i%c%c%4i%c %04X %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024, glt->inputtexels ? ']' : ' ', glt->crc, loaded ? "loaded" : "      ", (glt->flags & TEXF_MIPMAP) ? "mip" : "   ", (glt->flags & TEXF_ALPHA) ? "alpha" : "     ", glt->identifier ? glt->identifier : "<unnamed>");
+			Con_Printf("%c%4i%c%c%4i%c %04X %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024, glt->inputtexels ? ']' : ' ', glt->crc, loaded ? "loaded" : "      ", (glt->flags & TEXF_MIPMAP) ? "mip" : "   ", (glt->flags & TEXF_ALPHA) ? "alpha" : "     ", glt->identifier ? glt->identifier : "<unnamed>");
 		}
 		Con_Printf("pool %10p\n", pool);
 	}
@@ -458,7 +444,7 @@ 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
 
 	// use the largest scrap texture size we can (not sure if this is really a good idea)
@@ -468,7 +454,6 @@ static void r_textures_start(void)
 	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);
 }
 
 static void r_textures_shutdown(void)
@@ -480,21 +465,10 @@ static void r_textures_shutdown(void)
 		R_FreeTexturePool(&temp);
 	}
 
-	/*
-	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);
@@ -520,517 +494,73 @@ 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)
+void R_Textures_Frame (void)
 {
-	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);
-}
+	// could do procedural texture animation here, if we keep track of which
+	// textures were accessed this frame...
 
-/*
-================
-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(textureprocessingmempool, resamplerowsize);
-		resamplerow2 = Mem_Alloc(textureprocessingmempool, resamplerowsize);
-	}
-#define row1 resamplerow1
-#define row2 resamplerow2
-	if (bytesperpixel == 4)
+	// free the resize buffers
+	resizebuffersize = 0;
+	if (resizebuffer)
 	{
-		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;
-				}
-			}
-		}
+		Mem_Free(resizebuffer);
+		resizebuffer = NULL;
 	}
-	else if (bytesperpixel == 3)
+	if (colorconvertbuffer)
 	{
-		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 = (byte *)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;
-				}
-			}
-		}
+		Mem_Free(colorconvertbuffer);
+		colorconvertbuffer = NULL;
 	}
-	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)
+void R_MakeResizeBufferBigger(int size)
 {
-	int x, y, nextrow;
-	nextrow = *width * bytesperpixel;
-	if (*width > destwidth)
+	if (resizebuffersize < size)
 	{
-		*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");
+		resizebuffersize = size;
+		if (resizebuffer)
+			Mem_Free(resizebuffer);
+		if (colorconvertbuffer)
+			Mem_Free(colorconvertbuffer);
+		resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
+		colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
+		if (!resizebuffer || !colorconvertbuffer)
+			Host_Error("R_Upload: out of memory\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)
 	{
-		if (resizebuffersize < glt->image->width * glt->image->height * glt->image->bytesperpixel)
-		{
-			resizebuffersize = glt->image->width * glt->image->height * glt->image->bytesperpixel;
-			if (resizebuffer)
-				Mem_Free(resizebuffer);
-			if (colorconvertbuffer)
-				Mem_Free(colorconvertbuffer);
-			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");
+			R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->bytesperpixel);
 			glt->image->flags &= ~GLTEXF_UPLOAD;
 			memset(resizebuffer, 255, glt->image->width * glt->image->height * glt->image->bytesperpixel);
-			glTexImage2D (GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
+			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_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
 		}
 
 		if (prevbuffer == NULL)
 		{
+			R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->bytesperpixel);
 			memset(resizebuffer, 255, glt->width * glt->height * glt->image->bytesperpixel);
 			prevbuffer = resizebuffer;
 		}
@@ -1038,12 +568,14 @@ static void R_Upload(gltexture_t *glt, byte *data)
 		{
 			// promote paletted to RGBA, so we only have to worry about RGB and
 			// RGBA in the rest of this code
+			R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->bytesperpixel);
 			Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height, d_8to24table);
 			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
+		glt->texnum = glt->image->texnum;
 		return;
 	}
 
@@ -1053,18 +585,7 @@ static void R_Upload(gltexture_t *glt, byte *data)
 	for (width = 1;width < glt->width;width <<= 1);
 	for (height = 1;height < glt->height;height <<= 1);
 
-	if (resizebuffersize < width * height * glt->image->bytesperpixel)
-	{
-		resizebuffersize = width * height * glt->image->bytesperpixel;
-		if (resizebuffer)
-			Mem_Free(resizebuffer);
-		if (colorconvertbuffer)
-			Mem_Free(colorconvertbuffer);
-		resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
-		colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
-		if (!resizebuffer || !colorconvertbuffer)
-			Host_Error("R_Upload: out of memory\n");
-	}
+	R_MakeResizeBufferBigger(width * height * glt->image->bytesperpixel);
 
 	if (prevbuffer == NULL)
 	{
@@ -1085,14 +606,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;
 		}
 	}
@@ -1103,31 +624,32 @@ 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
 	}
+	glt->texnum = glt->image->texnum;
 }
 
 static void R_FindImageForTexture(gltexture_t *glt)
@@ -1139,6 +661,9 @@ static void R_FindImageForTexture(gltexture_t *glt)
 	texinfo = glt->textype;
 	pool = glt->pool;
 
+	// remains -1 until uploaded
+	glt->texnum = -1;
+
 	x = 0;
 	y = 0;
 	w = glt->width;
@@ -1152,10 +677,11 @@ static void R_FindImageForTexture(gltexture_t *glt)
 				continue;
 			if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat)
 				continue;
+			if (glt->width > image->width || glt->height > image->height)
+				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)
+			for (best = image->width, i = 0;i < image->width - w;i += texinfo->align)
 			{
 				for (best2 = 0, j = 0;j < w;j++)
 				{
@@ -1172,7 +698,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
 				}
 			}
 
-			if (best + h > block_size)
+			if (best + h > image->height)
 				continue;
 
 			for (i = 0;i < w;i++)
@@ -1188,12 +714,12 @@ static void R_FindImageForTexture(gltexture_t *glt)
 		image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
 		if (image == NULL)
 			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));
+		// make sure the created image is big enough for the fragment
+		for (image->width = block_size;image->width < glt->width;image->width <<= 1);
+		for (image->height = block_size;image->height < glt->height;image->height <<= 1);
+		image->blockallocation = Mem_Alloc(texturemempool, image->width * sizeof(short));
+		memset(image->blockallocation, 0, image->width * sizeof(short));
 
 		x = 0;
 		y = 0;
@@ -1207,7 +733,6 @@ static void R_FindImageForTexture(gltexture_t *glt)
 		image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
 		if (image == NULL)
 			Sys_Error("R_FindImageForTexture: ran out of memory\n");
-		//memset(image, 0, sizeof(*image));
 		image->type = GLIMAGETYPE_TILE;
 		image->blockallocation = NULL;
 
@@ -1243,43 +768,24 @@ static void R_FindImageForTexture(gltexture_t *glt)
 // note: R_FindImageForTexture must be called before this
 static void R_UploadTexture (gltexture_t *glt)
 {
-	if (!(glt->flags & (GLTEXF_UPLOAD | GLTEXF_PROCEDURAL)))
+	if (!(glt->flags & GLTEXF_UPLOAD))
 		return;
 
-	if (glt->flags & GLTEXF_PROCEDURAL)
-	{
-		if (glt->generate)
-		{
-			if (texturebuffersize < glt->width * glt->height * glt->textype->inputbytesperpixel)
-			{
-				if (texturebuffer)
-					Mem_Free(texturebuffer);
-				texturebuffersize = glt->width * glt->height * glt->textype->inputbytesperpixel;
-				texturebuffer = Mem_Alloc(textureprocessingmempool, texturebuffersize);
-			}
-
-			glt->generate(texturebuffer, glt->width, glt->height, (void *)glt->proceduraldata, glt->proceduraldatasize);
-		}
-	}
-	else
+	R_Upload(glt, glt->inputtexels);
+	if (glt->inputtexels)
 	{
-		R_Upload(glt, glt->inputtexels);
-		if (glt->inputtexels)
-		{
-			Mem_Free(glt->inputtexels);
-			glt->inputtexels = NULL;
-			glt->flags |= GLTEXF_DESTROYED;
-		}
-		else if (glt->flags & GLTEXF_DESTROYED)
-			Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed.  Can not upload original image again.  Uploaded blank texture.\n", glt->identifier);
+		Mem_Free(glt->inputtexels);
+		glt->inputtexels = NULL;
+		glt->flags |= GLTEXF_DESTROYED;
 	}
+	else if (glt->flags & GLTEXF_DESTROYED)
+		Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed.  Can not upload original image again.  Uploaded blank texture.\n", glt->identifier);
 }
 
-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)
 {
 	gltexture_t *glt;
 	glt = Mem_Alloc(texturemempool, sizeof(gltexture_t));
-	//memset(glt, 0, sizeof(gltexture_t));
 	if (identifier)
 	{
 		glt->identifier = Mem_Alloc(texturemempool, strlen(identifier)+1);
@@ -1306,17 +812,6 @@ static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int
 	else
 		glt->inputtexels = NULL;
 
-	glt->generate = generate;
-	glt->proceduraldatasize = proceduraldatasize;
-	if (proceduraldatasize)
-	{
-		glt->proceduraldata = Mem_Alloc(texturemempool, proceduraldatasize);
-		if (glt->proceduraldata == NULL)
-			Sys_Error("R_SetupTexture: out of memory\n");
-	}
-	else
-		glt->proceduraldata = NULL;
-
 	R_FindImageForTexture(glt);
 	R_PrecacheTexture(glt);
 
@@ -1328,7 +823,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;
@@ -1341,17 +836,9 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
 
 	texinfo = R_GetTexTypeInfo(textype, flags);
 
-	// data can be NULL
-//	if (data == NULL)
-//		Host_Error("R_LoadTexture: \"%s\" has no data\n", identifier);
-
 	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 * texinfo->internalbytesperpixel) & 3)
 			Host_Error("R_LoadTexture: incompatible width for fragment");
-	}
 
 	// clear the alpha flag if the texture has no transparent pixels
 	switch(textype)
@@ -1407,47 +894,10 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
 			return (rtexture_t *)glt; // exact match, use existing
 		}
 		Con_Printf("R_LoadTexture: cache mismatch on %s, replacing old texture\n", identifier);
-		R_FreeTexture(glt);
+		R_FreeTexture((rtexture_t *)glt);
 	}
 
-	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)
-{
-	gltexture_t		*glt;
-	gltexturepool_t	*pool = (gltexturepool_t *)rtexturepool;
-	textypeinfo_t	*texinfo;
-
-	if (cls.state == ca_dedicated)
-		return NULL;
-
-	texinfo = R_GetTexTypeInfo(textype, flags);
-
-	// no function is supported, for odd uses
-//	if (generate == NULL)
-//		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 * texinfo->internalbytesperpixel) & 3)
-			Host_Error("R_ProceduralTexture: incompatible width for fragment");
-	}
-
-	// see if the texture is already present
-	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");
-		R_FreeTexture(glt);
-	}
-
-	return (rtexture_t *)R_SetupTexture(pool, identifier, 0, width, height, flags | GLTEXF_PROCEDURAL | GLTEXF_UPLOAD, texinfo, NULL, generate, proceduraldata, proceduraldatasize);
+	return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data);
 }
 
 int R_TextureHasAlpha(rtexture_t *rt)
@@ -1547,7 +997,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)
@@ -1555,19 +1005,7 @@ 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(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);