X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_textures.c;h=e2a49dd35fa9609142674fbef2ebc2a971879cd8;hp=78bd26a783d9c7dc56b570af7371d72162dad7d9;hb=7be57779a5aad5abdf281eca4a321509f64fd0b3;hpb=f3118886042f1a39e3945f3a5ff0b6587cd347d1

diff --git a/gl_textures.c b/gl_textures.c
index 78bd26a7..e2a49dd3 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -1,38 +1,34 @@
+
 #include "quakedef.h"
+#include "image.h"
+#include "jpeg.h"
 
-cvar_t	r_max_size = {0, "r_max_size", "2048"};
-cvar_t	r_max_scrapsize = {0, "r_max_scrapsize", "1024"};
-cvar_t	r_picmip = {0, "r_picmip", "0"};
+cvar_t	gl_max_size = {CVAR_SAVE, "gl_max_size", "2048"};
+cvar_t	gl_max_scrapsize = {CVAR_SAVE, "gl_max_scrapsize", "256"};
+cvar_t	gl_picmip = {CVAR_SAVE, "gl_picmip", "0"};
 cvar_t	r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1"};
 cvar_t	r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1"};
+cvar_t  gl_texture_anisotropy = {CVAR_SAVE, "gl_texture_anisotropy", "1"};
 
-int		gl_filter_min = GL_LINEAR_MIPMAP_LINEAR; //NEAREST;
+int		gl_filter_min = GL_LINEAR_MIPMAP_LINEAR;
 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
 #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
-#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;
-
 typedef struct
 {
 	int textype;
@@ -40,39 +36,63 @@ typedef struct
 	int internalbytesperpixel;
 	int glformat;
 	int glinternalformat;
-	int align;
 }
 textypeinfo_t;
 
-static textypeinfo_t textype_qpalette       = {TEXTYPE_QPALETTE, 1, 4, GL_RGBA, 3, 1};
-static textypeinfo_t textype_rgb            = {TEXTYPE_RGB     , 3, 3, GL_RGB , 3, 3};
-static textypeinfo_t textype_rgba           = {TEXTYPE_RGBA    , 4, 4, GL_RGBA, 3, 1};
-static textypeinfo_t textype_qpalette_alpha = {TEXTYPE_QPALETTE, 1, 4, GL_RGBA, 4, 1};
-static textypeinfo_t textype_rgba_alpha     = {TEXTYPE_RGBA    , 4, 4, GL_RGBA, 4, 1};
+static textypeinfo_t textype_palette       = {TEXTYPE_PALETTE, 1, 4, GL_RGBA   , 3};
+static textypeinfo_t textype_rgb           = {TEXTYPE_RGB    , 3, 3, GL_RGB    , 3};
+static textypeinfo_t textype_rgba          = {TEXTYPE_RGBA   , 4, 4, GL_RGBA   , 3};
+static textypeinfo_t textype_palette_alpha = {TEXTYPE_PALETTE, 1, 4, GL_RGBA   , 4};
+static textypeinfo_t textype_rgba_alpha    = {TEXTYPE_RGBA   , 4, 4, GL_RGBA   , 4};
+static textypeinfo_t textype_dsdt          = {TEXTYPE_DSDT   , 2, 2, GL_DSDT_NV, GL_DSDT8_NV};
 
 // a tiling texture (most common type)
 #define GLIMAGETYPE_TILE 0
 // a fragments texture (contains one or more fragment textures)
 #define GLIMAGETYPE_FRAGMENTS 1
 
+#define GLTEXTURETYPE_1D 0
+#define GLTEXTURETYPE_2D 1
+#define GLTEXTURETYPE_3D 2
+#define GLTEXTURETYPE_CUBEMAP 3
+
+static int gltexturetypeenums[4] = {GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_ARB};
+static int gltexturetypebindingenums[4] = {GL_TEXTURE_BINDING_1D, GL_TEXTURE_BINDING_2D, GL_TEXTURE_BINDING_3D, GL_TEXTURE_BINDING_CUBE_MAP_ARB};
+static int gltexturetypedimensions[4] = {1, 2, 3, 2};
+static int cubemapside[6] =
+{
+	GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
+	GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB,
+	GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB,
+	GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB,
+	GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB,
+	GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB
+};
+
 // a gltextureimage can have one (or more if fragments) gltextures inside
 typedef struct gltextureimage_s
 {
 	struct gltextureimage_s *imagechain;
 	int texturecount;
 	int type; // one of the GLIMAGETYPE_ values
+	int texturetype; // one of the GLTEXTURETYPE_ values
+	int sides; // 1 or 6 depending on texturetype
 	int texnum; // GL texture slot number
-	int width, height;
+	int width, height, depth; // 3D texture support
 	int bytesperpixel; // bytes per pixel
 	int glformat; // GL_RGB or GL_RGBA
 	int glinternalformat; // 3 or 4
 	int flags;
-	short *blockallocation; // fragment allocation
+	short *blockallocation; // fragment allocation (2D only)
 }
 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
@@ -82,24 +102,21 @@ typedef struct gltexture_s
 	// name of the texture (this might be removed someday), no duplicates
 	char *identifier;
 	// 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;
-	// to identify cache mismatchs (this might be removed someday)
-	int crc;
-	// flags supplied to the LoadTexture/ProceduralTexture functions
+	int x, y, z, width, height, depth;
+	// copy of the original texture(s) supplied to the upload function, for
+	// delayed uploads (non-precached)
+	qbyte *inputtexels;
+	// original data size in *inputtexels
+	int inputdatasize;
+	// 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;
+	// one of the GLTEXTURETYPE_ values
+	int texturetype;
+	// palette if the texture is TEXTYPE_PALETTE
+	const unsigned int *palette;
 }
 gltexture_t;
 
@@ -107,7 +124,7 @@ gltexture_t;
 
 typedef struct gltexturepool_s
 {
-	int sentinel;
+	unsigned int sentinel;
 	struct gltextureimage_s *imagechain;
 	struct gltexture_s *gltchain;
 	struct gltexturepool_s *next;
@@ -116,11 +133,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;
@@ -131,8 +146,8 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
 	{
 		switch(textype)
 		{
-		case TEXTYPE_QPALETTE:
-			return &textype_qpalette_alpha;
+		case TEXTYPE_PALETTE:
+			return &textype_palette_alpha;
 		case TEXTYPE_RGB:
 			Host_Error("R_GetTexTypeInfo: RGB format has no alpha, TEXF_ALPHA not allowed\n");
 			return NULL;
@@ -147,12 +162,14 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
 	{
 		switch(textype)
 		{
-		case TEXTYPE_QPALETTE:
-			return &textype_qpalette;
+		case TEXTYPE_PALETTE:
+			return &textype_palette;
 		case TEXTYPE_RGB:
 			return &textype_rgb;
 		case TEXTYPE_RGBA:
 			return &textype_rgba;
+		case TEXTYPE_DSDT:
+			return &textype_dsdt;
 		default:
 			Host_Error("R_GetTexTypeInfo: unknown texture format\n");
 			return NULL;
@@ -178,72 +195,66 @@ 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
 	// image are also freed
-	image = glt->image;
-	image->texturecount--;
-	if (image->texturecount < 1)
+	if (glt->image)
 	{
-		for (gltimagepointer = &glt->pool->imagechain;*gltimagepointer && *gltimagepointer != image;gltimagepointer = &(*gltimagepointer)->imagechain);
-		if (*gltimagepointer == image)
-			*gltimagepointer = image->imagechain;
-		else
-			Host_Error("R_FreeTexture: image not linked in pool\n");
-		if (image->texnum)
+		image = glt->image;
+		image->texturecount--;
+		if (image->texturecount < 1)
 		{
-			texnum = image->texnum;
-			gltexnuminuse[image->texnum] = 0;
-			glDeleteTextures(1, &texnum);
+			for (gltimagepointer = &glt->pool->imagechain;*gltimagepointer && *gltimagepointer != image;gltimagepointer = &(*gltimagepointer)->imagechain);
+			if (*gltimagepointer == image)
+				*gltimagepointer = image->imagechain;
+			else
+				Host_Error("R_FreeTexture: image not linked in pool\n");
+			if (image->texnum)
+				qglDeleteTextures(1, &image->texnum);
+			if (image->blockallocation)
+				Mem_Free(image->blockallocation);
+			Mem_Free(image);
 		}
-		if (image->blockallocation)
-			Mem_Free(image->blockallocation);
-		Mem_Free(image);
 	}
 
 	if (glt->identifier)
 		Mem_Free(glt->identifier);
 	if (glt->inputtexels)
 		Mem_Free(glt->inputtexels);
-	if (glt->proceduraldata)
-		Mem_Free(glt->proceduraldata);
 	Mem_Free(glt);
 }
 
+/*
 static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier)
 {
 	gltexture_t	*glt;
@@ -257,14 +268,16 @@ static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier)
 
 	return NULL;
 }
+*/
 
 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;
-	//memset(pool, 0, sizeof(gltexturepool_t));
 	pool->next = gltexturepoolchain;
 	gltexturepoolchain = pool;
 	pool->sentinel = TEXTUREPOOL_SENTINEL;
@@ -288,7 +301,9 @@ 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);
 }
 
@@ -313,6 +328,7 @@ static glmode_t modes[] =
 static void GL_TextureMode_f (void)
 {
 	int i;
+	GLint oldbindtexnum;
 	gltextureimage_t *image;
 	gltexturepool_t *pool;
 
@@ -322,20 +338,20 @@ static void GL_TextureMode_f (void)
 		{
 			if (gl_filter_min == modes[i].minification)
 			{
-				Con_Printf ("%s\n", modes[i].name);
+				Con_Printf("%s\n", modes[i].name);
 				return;
 			}
 		}
-		Con_Printf ("current filter is unknown???\n");
+		Con_Print("current filter is unknown???\n");
 		return;
 	}
 
 	for (i = 0;i < 6;i++)
-		if (!Q_strcasecmp (modes[i].name, Cmd_Argv(1) ) )
+		if (!strcasecmp (modes[i].name, Cmd_Argv(1) ) )
 			break;
 	if (i == 6)
 	{
-		Con_Printf ("bad filter name\n");
+		Con_Print("bad filter name\n");
 		return;
 	}
 
@@ -349,14 +365,16 @@ static void GL_TextureMode_f (void)
 		for (image = pool->imagechain;image;image = image->imagechain)
 		{
 			// only update already uploaded images
-			if (!(image->flags & GLTEXF_UPLOAD))
+			if (!(image->flags & GLTEXF_UPLOAD) && !(image->flags & (TEXF_FORCENEAREST | TEXF_FORCELINEAR)))
 			{
-				glBindTexture(GL_TEXTURE_2D, image->texnum);
+				qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
+				qglBindTexture(gltexturetypeenums[image->texturetype], image->texnum);
 				if (image->flags & TEXF_MIPMAP)
-					glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+					qglTexParameteri(gltexturetypeenums[image->texturetype], 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(gltexturetypeenums[image->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+				qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+				qglBindTexture(gltexturetypeenums[image->texturetype], oldbindtexnum);
 			}
 		}
 	}
@@ -364,89 +382,100 @@ static void GL_TextureMode_f (void)
 
 static int R_CalcTexelDataSize (gltexture_t *glt)
 {
-	int width2, height2, size;
+	int width2, height2, depth2, size, picmip;
 	if (glt->flags & TEXF_FRAGMENT)
-		size = glt->width * glt->height;
+		size = glt->width * glt->height * glt->depth;
 	else
 	{
-		if (r_max_size.integer > realmaxsize)
-			Cvar_SetValue("r_max_size", realmaxsize);
+		picmip = 0;
+		if (glt->flags & TEXF_PICMIP)
+			picmip = gl_picmip.integer;
+		if (gl_max_size.integer > realmaxsize)
+			Cvar_SetValue("gl_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 (depth2 = 1;depth2 < glt->depth;depth2 <<= 1);
+		for (width2 >>= picmip;width2 > gl_max_size.integer;width2 >>= 1);
+		for (height2 >>= picmip;height2 > gl_max_size.integer;height2 >>= 1);
+		for (depth2 >>= picmip;depth2 > gl_max_size.integer;depth2 >>= 1);
 		if (width2 < 1) width2 = 1;
 		if (height2 < 1) height2 = 1;
+		if (depth2 < 1) depth2 = 1;
 
 		size = 0;
 		if (glt->flags & TEXF_MIPMAP)
 		{
-			while (width2 > 1 || height2 > 1)
+			while (width2 > 1 || height2 > 1 || depth2 > 1)
 			{
-				size += width2 * height2;
+				size += width2 * height2 * depth2;
 				if (width2 > 1)
 					width2 >>= 1;
 				if (height2 > 1)
 					height2 >>= 1;
+				if (depth2 > 1)
+					depth2 >>= 1;
 			}
 			size++; // count the last 1x1 mipmap
 		}
 		else
-			size = width2*height2;
+			size = width2 * height2 * depth2;
 	}
-	size *= glt->textype->internalbytesperpixel;
+	size *= glt->textype->internalbytesperpixel * glt->image->sides;
 
 	return size;
 }
 
-void R_TextureStats_PrintTotal(void)
+void R_TextureStats_Print(qboolean printeach, qboolean printpool, qboolean printtotal)
 {
-	int glsize, inputsize, total = 0, totalt = 0, totalp = 0, loaded = 0, loadedt = 0, loadedp = 0;
+	int glsize;
+	int isloaded;
+	int pooltotal = 0, pooltotalt = 0, pooltotalp = 0, poolloaded = 0, poolloadedt = 0, poolloadedp = 0;
+	int sumtotal = 0, sumtotalt = 0, sumtotalp = 0, sumloaded = 0, sumloadedt = 0, sumloadedp = 0;
 	gltexture_t *glt;
 	gltexturepool_t *pool;
+	if (printeach)
+		Con_Print("glsize input loaded mip alpha name\n");
 	for (pool = gltexturepoolchain;pool;pool = pool->next)
 	{
+		pooltotal = 0;
+		pooltotalt = 0;
+		pooltotalp = 0;
+		poolloaded = 0;
+		poolloadedt = 0;
+		poolloadedp = 0;
 		for (glt = pool->gltchain;glt;glt = glt->chain)
 		{
 			glsize = R_CalcTexelDataSize(glt);
-			inputsize = glt->width * glt->height * glt->textype->inputbytesperpixel;
-
-			total++;
-			totalt += glsize;
-			totalp += inputsize;
-			if (!(glt->flags & GLTEXF_UPLOAD))
+			isloaded = !(glt->flags & GLTEXF_UPLOAD);
+			pooltotal++;
+			pooltotalt += glsize;
+			pooltotalp += glt->inputdatasize;
+			if (isloaded)
 			{
-				loaded++;
-				loadedt += glsize;
-				loadedp += inputsize;
+				poolloaded++;
+				poolloadedt += glsize;
+				poolloadedp += glt->inputdatasize;
 			}
+			if (printeach)
+				Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", isloaded ? '[' : ' ', (glsize + 1023) / 1024, isloaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', isloaded ? "loaded" : "      ", (glt->flags & TEXF_MIPMAP) ? "mip" : "   ", (glt->flags & TEXF_ALPHA) ? "alpha" : "     ", glt->identifier ? glt->identifier : "<unnamed>");
 		}
+		if (printpool)
+			Con_Printf("texturepool %10p total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", pool, pooltotal, pooltotalt / 1048576.0, pooltotalp / 1048576.0, poolloaded, poolloadedt / 1048576.0, poolloadedp / 1048576.0, pooltotal - poolloaded, (pooltotalt - poolloadedt) / 1048576.0, (pooltotalp - poolloadedp) / 1048576.0);
+		sumtotal += pooltotal;
+		sumtotalt += pooltotalt;
+		sumtotalp += pooltotalp;
+		sumloaded += poolloaded;
+		sumloadedt += poolloadedt;
+		sumloadedp += poolloadedp;
 	}
-	Con_Printf("total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", total, totalt / 1048576.0, totalp / 1048576.0, loaded, loadedt / 1048576.0, loadedp / 1048576.0, total - loaded, (totalt - loadedt) / 1048576.0, (totalp - loadedp) / 1048576.0);
+	if (printtotal)
+		Con_Printf("textures total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", sumtotal, sumtotalt / 1048576.0, sumtotalp / 1048576.0, sumloaded, sumloadedt / 1048576.0, sumloadedp / 1048576.0, sumtotal - sumloaded, (sumtotalt - sumloadedt) / 1048576.0, (sumtotalp - sumloadedp) / 1048576.0);
 }
 
 static void R_TextureStats_f(void)
 {
-	int loaded;
-	gltexture_t *glt;
-	gltexturepool_t *pool;
-	Con_Printf("glsize input crc  loaded mip alpha name\n");
-	for (pool = gltexturepoolchain;pool;pool = pool->next)
-	{
-		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("pool %10p\n", pool);
-	}
-	R_TextureStats_PrintTotal();
+	R_TextureStats_Print(true, true, true);
 }
 
 char engineversion[40];
@@ -454,44 +483,44 @@ 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
+	// LordHavoc: allow any alignment
+	qglPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 	CHECKGLERROR
 
 	// 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);
+	for (block_size = 1;block_size < realmaxsize && block_size < gl_max_scrapsize.integer;block_size <<= 1);
 
-	texturemempool = Mem_AllocPool("Textures");
-	gltexnuminuse = Mem_Alloc(texturemempool, MAX_GLTEXTURES);
-	//memset(gltexnuminuse, 0, MAX_GLTEXTURES);
+	texturemempool = Mem_AllocPool("Texture Info", 0, NULL);
+	texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)", 0, NULL);
+	textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers", 0, NULL);
+
+	// Disable JPEG screenshots if the DLL isn't loaded
+	if (! JPEG_OpenLibrary ())
+		Cvar_SetValueQuick (&scr_screenshot_jpeg, 0);
 }
 
 static void r_textures_shutdown(void)
 {
 	rtexturepool_t *temp;
+
+	JPEG_CloseLibrary ();
+
 	while(gltexturepoolchain)
 	{
 		temp = (rtexturepool_t *) gltexturepoolchain;
 		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);
+	Mem_FreePool(&texturedatamempool);
+	Mem_FreePool(&textureprocessingmempool);
 }
 
 static void r_textures_newmap(void)
@@ -500,640 +529,379 @@ static void r_textures_newmap(void)
 
 void R_Textures_Init (void)
 {
-	Cmd_AddCommand ("gl_texturemode", &GL_TextureMode_f);
+	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 (&gl_max_scrapsize);
+	Cvar_RegisterVariable (&gl_max_size);
+	Cvar_RegisterVariable (&gl_picmip);
 	Cvar_RegisterVariable (&r_lerpimages);
 	Cvar_RegisterVariable (&r_precachetextures);
-	gltexnuminuse = NULL;
+	Cvar_RegisterVariable (&gl_texture_anisotropy);
 
 	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)
+	static int old_aniso = 0;
+
+	// could do procedural texture animation here, if we keep track of which
+	// textures were accessed this frame...
+
+	// free the resize buffers
+	resizebuffersize = 0;
+	if (resizebuffer)
 	{
-		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];
-			}
-		}
+		Mem_Free(resizebuffer);
+		resizebuffer = NULL;
 	}
-	else if (bytesperpixel == 3)
+	if (colorconvertbuffer)
+	{
+		Mem_Free(colorconvertbuffer);
+		colorconvertbuffer = NULL;
+	}
+
+	if (old_aniso != gl_texture_anisotropy.integer)
 	{
-		for (j = 0,f = 0;j < outwidth;j++, f += fstep)
+		gltextureimage_t *image;
+		gltexturepool_t *pool;
+		GLint oldbindtexnum;
+
+		old_aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
+
+		Cvar_SetValueQuick(&gl_texture_anisotropy, old_aniso);
+
+		for (pool = gltexturepoolchain;pool;pool = pool->next)
 		{
-			xi = f >> 16;
-			if (xi != oldx)
+			for (image = pool->imagechain;image;image = image->imagechain)
 			{
-				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];
+				// only update already uploaded images
+				if (!(image->flags & GLTEXF_UPLOAD))
+				{
+					qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
+
+					qglBindTexture(gltexturetypeenums[image->texturetype], image->texnum);
+					qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MAX_ANISOTROPY_EXT, old_aniso);CHECKGLERROR
+
+					qglBindTexture(gltexturetypeenums[image->texturetype], oldbindtexnum);
+				}
 			}
 		}
 	}
-	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)
+void R_MakeResizeBufferBigger(int size)
 {
-	if (resamplerowsize < outwidth*4)
+	if (resizebuffersize < size)
 	{
-		if (resamplerow1)
-			Mem_Free(resamplerow1);
-		if (resamplerow2)
-			Mem_Free(resamplerow2);
-		resamplerowsize = outwidth*4;
-		resamplerow1 = Mem_Alloc(texturemempool, resamplerowsize);
-		resamplerow2 = Mem_Alloc(texturemempool, resamplerowsize);
+		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");
 	}
-#define row1 resamplerow1
-#define row2 resamplerow2
-	if (bytesperpixel == 4)
+}
+
+static void GL_SetupTextureParameters(int flags, int texturetype)
+{
+	int textureenum = gltexturetypeenums[texturetype];
+	int wrapmode = ((flags & TEXF_CLAMP) && gl_support_clamptoedge) ? GL_CLAMP_TO_EDGE : GL_REPEAT;
+
+	CHECKGLERROR
+
+	if (gl_support_anisotropy)
 	{
-		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;
-				}
-			}
-		}
+		int aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
+		if (gl_texture_anisotropy.integer != aniso)
+			Cvar_SetValueQuick(&gl_texture_anisotropy, aniso);
+		qglTexParameteri(textureenum, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso);CHECKGLERROR
+	}
+	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode);CHECKGLERROR
+	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode);CHECKGLERROR
+	if (gltexturetypedimensions[texturetype] >= 3)
+	{
+		qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode);CHECKGLERROR
 	}
-	else if (bytesperpixel == 3)
+
+	CHECKGLERROR
+	if (flags & TEXF_FORCENEAREST)
 	{
-		if (r_lerpimages.integer)
+		if (flags & TEXF_MIPMAP)
 		{
-			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);
-				}
-			}
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);CHECKGLERROR
 		}
 		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;
-				}
-			}
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST);CHECKGLERROR
 		}
+		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_NEAREST);CHECKGLERROR
 	}
-	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)
+	else if (flags & TEXF_FORCELINEAR)
 	{
-		*width >>= 1;
-		if (*height > destheight)
+		if (flags & TEXF_MIPMAP)
 		{
-			// reduce both
-			*height >>= 1;
-			if (bytesperpixel == 4)
+			if (gl_filter_min == GL_NEAREST_MIPMAP_LINEAR || gl_filter_min == GL_LINEAR_MIPMAP_LINEAR)
 			{
-				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
-				}
+				qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);CHECKGLERROR
 			}
-			else if (bytesperpixel == 3)
+			else
 			{
-				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
-				}
+				qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);CHECKGLERROR
 			}
-			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);
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR);CHECKGLERROR
 		}
+		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR);CHECKGLERROR
 	}
 	else
 	{
-		if (*height > destheight)
+		if (flags & TEXF_MIPMAP)
 		{
-			// 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);
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min);CHECKGLERROR
 		}
 		else
-			Sys_Error("R_MipReduce: desired size already achieved\n");
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag);CHECKGLERROR
+		}
+		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);CHECKGLERROR
 	}
+
+	CHECKGLERROR
 }
 
-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;
+	int i, mip, width, height, depth;
+	GLint oldbindtexnum;
+	qbyte *prevbuffer;
 	prevbuffer = data;
 
-	glBindTexture(GL_TEXTURE_2D, glt->image->texnum);
 	CHECKGLERROR
 
+	glt->texnum = glt->image->texnum;
+	// we need to restore the texture binding after finishing the upload
+	qglGetIntegerv(gltexturetypebindingenums[glt->image->texturetype], &oldbindtexnum);
+	qglBindTexture(gltexturetypeenums[glt->image->texturetype], glt->image->texnum);
+	CHECKGLERROR
 	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(texturemempool, resizebuffersize);
-			colorconvertbuffer = Mem_Alloc(texturemempool, resizebuffersize);
-			if (!resizebuffer || !colorconvertbuffer)
-				Host_Error("R_Upload: out of memory\n");
-		}
-
 		if (glt->image->flags & GLTEXF_UPLOAD)
 		{
 			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);
-			CHECKGLERROR
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
-			CHECKGLERROR
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
-			CHECKGLERROR
+			Con_DPrint("uploaded new fragments image\n");
+			R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
+			memset(resizebuffer, 255, glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
+			switch(glt->image->texturetype)
+			{
+			case GLTEXTURETYPE_1D:
+				qglTexImage1D(GL_TEXTURE_1D, 0, glt->image->glinternalformat, glt->image->width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
+				CHECKGLERROR
+				break;
+			case GLTEXTURETYPE_2D:
+				qglTexImage2D(GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
+				CHECKGLERROR
+				break;
+			case GLTEXTURETYPE_3D:
+				qglTexImage3D(GL_TEXTURE_3D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, glt->image->depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
+				CHECKGLERROR
+				break;
+			default:
+				Host_Error("R_Upload: fragment texture of type other than 1D, 2D, or 3D\n");
+				break;
+			}
+			GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype);
 		}
 
 		if (prevbuffer == NULL)
 		{
-			memset(resizebuffer, 255, glt->width * glt->height * glt->image->bytesperpixel);
+			R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
+			memset(resizebuffer, 0, glt->width * glt->height * glt->image->depth * glt->image->bytesperpixel);
 			prevbuffer = resizebuffer;
 		}
-		else if (glt->textype->textype == TEXTYPE_QPALETTE)
+		else if (glt->textype->textype == TEXTYPE_PALETTE)
 		{
 			// promote paletted to RGBA, so we only have to worry about RGB and
 			// RGBA in the rest of this code
-			Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height, d_8to24table);
+			R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->sides * glt->image->bytesperpixel);
+			Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth, glt->palette);
 			prevbuffer = colorconvertbuffer;
 		}
 
-		glTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-		CHECKGLERROR
-		return;
+		switch(glt->image->texturetype)
+		{
+		case GLTEXTURETYPE_1D:
+			qglTexSubImage1D(GL_TEXTURE_1D, 0, glt->x, glt->width, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+			CHECKGLERROR
+			break;
+		case GLTEXTURETYPE_2D:
+			qglTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+			CHECKGLERROR
+			break;
+		case GLTEXTURETYPE_3D:
+			qglTexSubImage3D(GL_TEXTURE_3D, 0, glt->x, glt->y, glt->z, glt->width, glt->height, glt->depth, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+			CHECKGLERROR
+			break;
+		default:
+			Host_Error("R_Upload: fragment texture of type other than 1D, 2D, or 3D\n");
+			break;
+		}
 	}
+	else
+	{
+		glt->image->flags &= ~GLTEXF_UPLOAD;
 
-	glt->image->flags &= ~GLTEXF_UPLOAD;
+		// these are rounded up versions of the size to do better resampling
+		for (width  = 1;width  < glt->width ;width  <<= 1);
+		for (height = 1;height < glt->height;height <<= 1);
+		for (depth  = 1;depth  < glt->depth ;depth  <<= 1);
 
-	// 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;
+		R_MakeResizeBufferBigger(width * height * depth * glt->image->sides * glt->image->bytesperpixel);
 
-	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(texturemempool, resizebuffersize);
-		colorconvertbuffer = Mem_Alloc(texturemempool, resizebuffersize);
-		if (!resizebuffer || !colorconvertbuffer)
-			Host_Error("R_Upload: out of memory\n");
-	}
-
-	if (prevbuffer == NULL)
-	{
-		width = glt->image->width;
-		height = glt->image->height;
-		memset(resizebuffer, 255, width * height * glt->image->bytesperpixel);
-		prevbuffer = resizebuffer;
-	}
-	else
-	{
-		if (glt->textype->textype == TEXTYPE_QPALETTE)
+		if (prevbuffer == NULL)
 		{
-			// promote paletted to RGBA, so we only have to worry about RGB and
-			// RGBA in the rest of this code
-			Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height, d_8to24table);
-			prevbuffer = colorconvertbuffer;
+			width = glt->image->width;
+			height = glt->image->height;
+			depth = glt->image->depth;
+			memset(resizebuffer, 0, width * height * depth * glt->image->bytesperpixel);
+			prevbuffer = resizebuffer;
 		}
-
-		if (glt->width != width || glt->height != height)
+		else
 		{
-			R_ResampleTexture(prevbuffer, glt->width, glt->height, resizebuffer, width, height, glt->image->bytesperpixel);
-			prevbuffer = resizebuffer;
+			if (glt->textype->textype == TEXTYPE_PALETTE)
+			{
+				// promote paletted to RGBA, so we only have to worry about RGB and
+				// RGBA in the rest of this code
+				Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth * glt->image->sides, glt->palette);
+				prevbuffer = colorconvertbuffer;
+			}
 		}
 
-		// apply picmip/max_size limitations
-		while (width > glt->image->width || height > glt->image->height)
+		// cubemaps contain multiple images and thus get processed a bit differently
+		if (glt->image->texturetype != GLTEXTURETYPE_CUBEMAP)
 		{
-			R_MipReduce(prevbuffer, resizebuffer, &width, &height, glt->image->width, glt->image->height, glt->image->bytesperpixel);
-			prevbuffer = resizebuffer;
+			if (glt->width != width || glt->height != height || glt->depth != depth)
+			{
+				Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer);
+				prevbuffer = resizebuffer;
+			}
+			// picmip/max_size
+			while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth)
+			{
+				Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel);
+				prevbuffer = resizebuffer;
+			}
 		}
-	}
-
-	// 3 and 4 are converted by the driver to it's preferred format for the current display mode
-	internalformat = 3;
-	if (glt->flags & TEXF_ALPHA)
-		internalformat = 4;
-
-	mip = 0;
-	glTexImage2D(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)
+		mip = 0;
+		switch(glt->image->texturetype)
 		{
-			R_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);
+		case GLTEXTURETYPE_1D:
+			qglTexImage1D(GL_TEXTURE_1D, mip++, glt->image->glinternalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
 			CHECKGLERROR
+			if (glt->flags & TEXF_MIPMAP)
+			{
+				while (width > 1 || height > 1 || depth > 1)
+				{
+					Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+					prevbuffer = resizebuffer;
+					qglTexImage1D(GL_TEXTURE_1D, mip++, glt->image->glinternalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+					CHECKGLERROR
+				}
+			}
+			break;
+		case GLTEXTURETYPE_2D:
+			qglTexImage2D(GL_TEXTURE_2D, mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+			CHECKGLERROR
+			if (glt->flags & TEXF_MIPMAP)
+			{
+				while (width > 1 || height > 1 || depth > 1)
+				{
+					Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+					prevbuffer = resizebuffer;
+					qglTexImage2D(GL_TEXTURE_2D, mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+					CHECKGLERROR
+				}
+			}
+			break;
+		case GLTEXTURETYPE_3D:
+			qglTexImage3D(GL_TEXTURE_3D, mip++, glt->image->glinternalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+			CHECKGLERROR
+			if (glt->flags & TEXF_MIPMAP)
+			{
+				while (width > 1 || height > 1 || depth > 1)
+				{
+					Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+					prevbuffer = resizebuffer;
+					qglTexImage3D(GL_TEXTURE_3D, mip++, glt->image->glinternalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+					CHECKGLERROR
+				}
+			}
+			break;
+		case GLTEXTURETYPE_CUBEMAP:
+			// convert and upload each side in turn,
+			// from a continuous block of input texels
+			texturebuffer = prevbuffer;
+			for (i = 0;i < 6;i++)
+			{
+				prevbuffer = texturebuffer;
+				texturebuffer += glt->width * glt->height * glt->depth * glt->textype->inputbytesperpixel;
+				if (glt->width != width || glt->height != height || glt->depth != depth)
+				{
+					Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer);
+					prevbuffer = resizebuffer;
+				}
+				// picmip/max_size
+				while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth)
+				{
+					Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel);
+					prevbuffer = resizebuffer;
+				}
+				mip = 0;
+				qglTexImage2D(cubemapside[i], mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+				CHECKGLERROR
+				if (glt->flags & TEXF_MIPMAP)
+				{
+					while (width > 1 || height > 1 || depth > 1)
+					{
+						Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+						prevbuffer = resizebuffer;
+						qglTexImage2D(cubemapside[i], mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+						CHECKGLERROR
+					}
+				}
+			}
+			break;
 		}
-
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-		CHECKGLERROR
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
-		CHECKGLERROR
-	}
-	else
-	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
-		CHECKGLERROR
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
-		CHECKGLERROR
+		GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype);
 	}
+	qglBindTexture(gltexturetypeenums[glt->image->texturetype], oldbindtexnum);
 }
 
 static void R_FindImageForTexture(gltexture_t *glt)
 {
-	int i, j, best, best2, x, y, w, h;
+	int i, j, best, best2, x, y, z, w, h, d, picmip;
 	textypeinfo_t *texinfo;
 	gltexturepool_t *pool;
 	gltextureimage_t *image, **imagechainpointer;
 	texinfo = glt->textype;
 	pool = glt->pool;
 
+	// remains -1 until uploaded
+	glt->texnum = -1;
+
 	x = 0;
 	y = 0;
+	z = 0;
 	w = glt->width;
 	h = glt->height;
+	d = glt->depth;
 	if (glt->flags & TEXF_FRAGMENT)
 	{
 		for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain)
@@ -1141,12 +909,17 @@ static void R_FindImageForTexture(gltexture_t *glt)
 			image = *imagechainpointer;
 			if (image->type != GLIMAGETYPE_FRAGMENTS)
 				continue;
+			if (image->texturetype != glt->texturetype)
+				continue;
+			if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP))
+				continue;
 			if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat)
 				continue;
+			if (glt->width > image->width || glt->height > image->height || glt->depth > image->depth)
+				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++)
 			{
 				for (best2 = 0, j = 0;j < w;j++)
 				{
@@ -1163,7 +936,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++)
@@ -1171,6 +944,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
 
 			glt->x = x;
 			glt->y = y;
+			glt->z = 0;
 			glt->image = image;
 			image->texturecount++;
 			return;
@@ -1179,15 +953,21 @@ 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);
+		image->height = 1;
+		if (gltexturetypedimensions[glt->texturetype] >= 2)
+			for (image->height = block_size;image->height < glt->height;image->height <<= 1);
+		image->depth = 1;
+		if (gltexturetypedimensions[glt->texturetype] >= 3)
+			for (image->depth = block_size;image->depth < glt->depth;image->depth <<= 1);
+		image->blockallocation = Mem_Alloc(texturemempool, image->width * sizeof(short));
+		memset(image->blockallocation, 0, image->width * sizeof(short));
 
 		x = 0;
 		y = 0;
+		z = 0;
 		for (i = 0;i < w;i++)
 			image->blockallocation[x + i] = y + h;
 	}
@@ -1198,165 +978,106 @@ 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;
 
+		picmip = 0;
+		if (glt->flags & TEXF_PICMIP)
+			picmip = gl_picmip.integer;
 		// 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;
+		if (gl_max_size.integer > realmaxsize)
+			Cvar_SetValue("gl_max_size", realmaxsize);
+		for (image->width = 1;image->width < glt->width;image->width <<= 1);
+		for (image->height = 1;image->height < glt->height;image->height <<= 1);
+		for (image->depth = 1;image->depth < glt->depth;image->depth <<= 1);
+		for (image->width >>= picmip;image->width > gl_max_size.integer;image->width >>= 1);
+		for (image->height >>= picmip;image->height > gl_max_size.integer;image->height >>= 1);
+		for (image->depth >>= picmip;image->depth > gl_max_size.integer;image->depth >>= 1);
 		if (image->width < 1) image->width = 1;
 		if (image->height < 1) image->height = 1;
+		if (image->depth < 1) image->depth = 1;
 	}
+	image->texturetype = glt->texturetype;
 	image->glinternalformat = texinfo->glinternalformat;
 	image->glformat = texinfo->glformat;
-	image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA)) | GLTEXF_UPLOAD;
+	image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP)) | GLTEXF_UPLOAD;
 	image->bytesperpixel = texinfo->internalbytesperpixel;
-	for (i = 1;i < MAX_GLTEXTURES;i++)
-		if (!gltexnuminuse[i])
-			break;
-	if (i < MAX_GLTEXTURES)
-		gltexnuminuse[image->texnum = i] = true;
-	else
-		Sys_Error("R_FindImageForTexture: ran out of GL textures\n");
+	image->sides = image->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
+	// get a texture number to use
+	qglGenTextures(1, &image->texnum);
 	*imagechainpointer = image;
 	image->texturecount++;
 
 	glt->x = x;
 	glt->y = y;
+	glt->y = z;
 	glt->image = image;
 }
 
 // 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(texturemempool, texturebuffersize);
-			}
-
-			glt->generate(texturebuffer, glt->width, glt->height, (void *)glt->proceduraldata, glt->proceduraldatasize);
-		}
-	}
-	else
-	{
-		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);
-	}
-}
-
-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)
-{
-	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);
-		strcpy (glt->identifier, identifier);
-	}
-	else
-		glt->identifier = NULL;
-	glt->pool = pool;
-	glt->chain = pool->gltchain;
-	pool->gltchain = glt;
-	glt->crc = crc;
-	glt->width = width;
-	glt->height = height;
-	glt->flags = flags;
-	glt->textype = texinfo;
-
-	if (data)
+	R_Upload(glt, glt->inputtexels);
+	if (glt->inputtexels)
 	{
-		glt->inputtexels = Mem_Alloc(texturemempool, 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);
-	}
-	else
+		Mem_Free(glt->inputtexels);
 		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");
+		glt->flags |= GLTEXF_DESTROYED;
 	}
-	else
-		glt->proceduraldata = NULL;
-
-	R_FindImageForTexture(glt);
-	R_PrecacheTexture(glt);
-
-	return glt;
+	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);
 }
 
-/*
-================
-R_LoadTexture
-================
-*/
-rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, byte *data, int textype, int flags)
+static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, int sides, int flags, int textype, int texturetype, const qbyte *data, const unsigned int *palette)
 {
-	int i;
+	int i, size;
 	gltexture_t *glt;
 	gltexturepool_t *pool = (gltexturepool_t *)rtexturepool;
 	textypeinfo_t *texinfo;
-	unsigned short crc;
 
 	if (cls.state == ca_dedicated)
 		return NULL;
 
-	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 && texturetype != GLTEXTURETYPE_2D)
+		Sys_Error("R_LoadTexture: only 2D fragment textures implemented\n");
+	if (texturetype == GLTEXTURETYPE_CUBEMAP && !gl_texturecubemap)
+		Sys_Error("R_LoadTexture: cubemap texture not supported by driver\n");
+	if (texturetype == GLTEXTURETYPE_3D && !gl_texture3d)
+		Sys_Error("R_LoadTexture: 3d texture not supported by driver\n");
 
-	if (flags & TEXF_FRAGMENT)
+	/*
+	glt = R_FindTexture (pool, identifier);
+	if (glt)
 	{
-		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");
+		Con_Printf("R_LoadTexture: replacing existing texture %s\n", identifier);
+		R_FreeTexture((rtexture_t *)glt);
 	}
+	*/
+
+	texinfo = R_GetTexTypeInfo(textype, flags);
+	size = width * height * depth * sides * texinfo->inputbytesperpixel;
+	if (size < 1)
+		Sys_Error("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides);
 
 	// clear the alpha flag if the texture has no transparent pixels
 	switch(textype)
 	{
-	case TEXTYPE_QPALETTE:
+	case TEXTYPE_PALETTE:
 		if (flags & TEXF_ALPHA)
 		{
 			flags &= ~TEXF_ALPHA;
-			for (i = 0;i < width * height;i++)
+			if (data)
 			{
-				if (data[i] == 255)
+				for (i = 0;i < size;i++)
 				{
-					flags |= TEXF_ALPHA;
-					break;
+					if (((qbyte *)&palette[data[i]])[3] < 255)
+					{
+						flags |= TEXF_ALPHA;
+						break;
+					}
 				}
 			}
 		}
@@ -1369,115 +1090,122 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
 		if (flags & TEXF_ALPHA)
 		{
 			flags &= ~TEXF_ALPHA;
-			for (i = 0;i < width * height;i++)
+			if (data)
 			{
-				if (data[i * 4 + 3] < 255)
+				for (i = 3;i < size;i += 4)
 				{
-					flags |= TEXF_ALPHA;
-					break;
+					if (data[i] < 255)
+					{
+						flags |= TEXF_ALPHA;
+						break;
+					}
 				}
 			}
 		}
 		break;
+	case TEXTYPE_DSDT:
+		break;
 	default:
 		Host_Error("R_LoadTexture: unknown texture type\n");
 	}
 
-	// LordHavoc: do a CRC to confirm the data really is the same as previous occurances.
-	if (data == NULL)
-		crc = 0;
+	glt = Mem_Alloc(texturemempool, sizeof(gltexture_t));
+	if (identifier)
+	{
+		glt->identifier = Mem_Alloc(texturemempool, strlen(identifier)+1);
+		strcpy (glt->identifier, identifier);
+	}
 	else
-		crc = CRC_Block(data, width*height*texinfo->inputbytesperpixel);
+		glt->identifier = NULL;
+	glt->pool = pool;
+	glt->chain = pool->gltchain;
+	pool->gltchain = glt;
+	glt->width = width;
+	glt->height = height;
+	glt->depth = depth;
+	glt->flags = flags | GLTEXF_UPLOAD;
+	glt->textype = texinfo;
+	glt->texturetype = texturetype;
+	glt->inputdatasize = size;
+	glt->palette = palette;
 
-	// see if the texture is already present
-	if (identifier && (glt = R_FindTexture(pool, identifier)))
+	if (data)
 	{
-		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)
-			return (rtexture_t *)glt; // exact match, use existing
-		Con_Printf("R_LoadTexture: cache mismatch on %s, replacing old texture\n", identifier);
-		R_FreeTexture(glt);
+		glt->inputtexels = Mem_Alloc(texturedatamempool, size);
+		if (glt->inputtexels == NULL)
+			Sys_Error("R_LoadTexture: out of memory\n");
+		memcpy(glt->inputtexels, data, size);
 	}
+	else
+		glt->inputtexels = NULL;
 
-	return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data, NULL, NULL, 0);
+	R_FindImageForTexture(glt);
+	R_PrecacheTexture(glt);
+
+	return (rtexture_t *)glt;
 }
 
-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_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette)
 {
-	gltexture_t		*glt;
-	gltexturepool_t	*pool = (gltexturepool_t *)rtexturepool;
-	textypeinfo_t	*texinfo;
-
-	if (cls.state == ca_dedicated)
-		return NULL;
-
-	texinfo = R_GetTexTypeInfo(textype, flags);
+	return R_SetupTexture(rtexturepool, identifier, width, 1, 1, 1, flags, textype, GLTEXTURETYPE_1D, data, palette);
+}
 
-	// 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");
-	}
+rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const qbyte *data, int textype, int flags, const unsigned int *palette)
+{
+	return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, flags, textype, GLTEXTURETYPE_2D, data, palette);
+}
 
-	// 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)
-			return (rtexture_t *)glt; // exact match, use existing
-		Con_DPrintf("R_LoadTexture: cache mismatch, replacing old texture\n");
-		R_FreeTexture(glt);
-	}
+rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const qbyte *data, int textype, int flags, const unsigned int *palette)
+{
+	return R_SetupTexture(rtexturepool, identifier, width, height, depth, 1, flags, textype, GLTEXTURETYPE_3D, data, palette);
+}
 
-	return (rtexture_t *)R_SetupTexture(pool, identifier, 0, width, height, flags | GLTEXF_PROCEDURAL | GLTEXF_UPLOAD, texinfo, NULL, generate, proceduraldata, proceduraldatasize);
+rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette)
+{
+	return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, flags, textype, GLTEXTURETYPE_CUBEMAP, data, palette);
 }
 
 int R_TextureHasAlpha(rtexture_t *rt)
 {
-	gltexture_t *glt;
-	if (!rt)
-		return false;
-	glt = (gltexture_t *)rt;
-	return (glt->flags & TEXF_ALPHA) != 0;
+	return rt ? (((gltexture_t *)rt)->flags & TEXF_ALPHA) != 0 : false;
 }
 
 int R_TextureWidth(rtexture_t *rt)
 {
-	if (!rt)
-		return false;
-	return ((gltexture_t *)rt)->width;
+	return rt ? ((gltexture_t *)rt)->width : 0;
 }
 
 int R_TextureHeight(rtexture_t *rt)
 {
-	if (!rt)
-		return false;
-	return ((gltexture_t *)rt)->height;
+	return rt ? ((gltexture_t *)rt)->height : 0;
 }
 
-void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
+void R_FragmentLocation3D(rtexture_t *rt, int *x, int *y, int *z, float *fx1, float *fy1, float *fz1, float *fx2, float *fy2, float *fz2)
 {
 	gltexture_t *glt;
-	float iwidth, iheight;
+	float iwidth, iheight, idepth;
 	if (cls.state == ca_dedicated)
 	{
 		if (x)
 			*x = 0;
 		if (y)
 			*y = 0;
+		if (z)
+			*z = 0;
 		if (fx1 || fy1 || fx2 || fy2)
 		{
 			if (fx1)
 				*fx1 = 0;
 			if (fy1)
 				*fy1 = 0;
+			if (fz1)
+				*fz1 = 0;
 			if (fx2)
 				*fx2 = 1;
 			if (fy2)
 				*fy2 = 1;
+			if (fz2)
+				*fz2 = 1;
 		}
 		return;
 	}
@@ -1494,14 +1222,19 @@ void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1,
 		{
 			iwidth = 1.0f / glt->image->width;
 			iheight = 1.0f / glt->image->height;
+			idepth = 1.0f / glt->image->depth;
 			if (fx1)
 				*fx1 = glt->x * iwidth;
 			if (fy1)
 				*fy1 = glt->y * iheight;
+			if (fz1)
+				*fz1 = glt->z * idepth;
 			if (fx2)
 				*fx2 = (glt->x + glt->width) * iwidth;
 			if (fy2)
 				*fy2 = (glt->y + glt->height) * iheight;
+			if (fz2)
+				*fz2 = (glt->z + glt->depth) * idepth;
 		}
 	}
 	else
@@ -1510,29 +1243,37 @@ void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1,
 			*x = 0;
 		if (y)
 			*y = 0;
+		if (z)
+			*z = 0;
 		if (fx1 || fy1 || fx2 || fy2)
 		{
 			if (fx1)
 				*fx1 = 0;
 			if (fy1)
 				*fy1 = 0;
+			if (fz1)
+				*fz1 = 0;
 			if (fx2)
 				*fx2 = 1;
 			if (fy2)
 				*fy2 = 1;
+			if (fz2)
+				*fz2 = 1;
 		}
 	}
 }
 
+void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
+{
+	R_FragmentLocation3D(rt, x, y, NULL, fx1, fy1, NULL, fx2, fy2, NULL);
+}
+
 int R_CompatibleFragmentWidth(int width, int textype, int flags)
 {
-	textypeinfo_t *texinfo = R_GetTexTypeInfo(textype, flags);
-	while ((width * texinfo->internalbytesperpixel) & 3)
-		width++;
 	return width;
 }
 
-void R_UpdateTexture(rtexture_t *rt, byte *data)
+void R_UpdateTexture(rtexture_t *rt, qbyte *data)
 {
 	gltexture_t *glt;
 	if (rt == NULL)
@@ -1540,16 +1281,11 @@ 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);
-			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->inputdatasize);
+	else
+		R_Upload(glt, data);
 }