X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_textures.c;h=558b1f59cb457bfab6721dec5a539c06e0e5c99e;hp=8afef82c5b865769e5052b50dbb4a4e0cddfa2af;hb=fabdca42b48cc4acf214c06adda9814e5cce8577;hpb=73adb98f44f142d436db71bdef5a9d3609b7127e

diff --git a/gl_textures.c b/gl_textures.c
index 8afef82c..558b1f59 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -1,46 +1,313 @@
+
 #include "quakedef.h"
+#include "image.h"
+
+cvar_t	r_max_size = {CVAR_SAVE, "r_max_size", "2048"};
+cvar_t	r_max_scrapsize = {CVAR_SAVE, "r_max_scrapsize", "256"};
+cvar_t	r_picmip = {CVAR_SAVE, "r_picmip", "0"};
+cvar_t	r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1"};
+cvar_t	r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1"};
 
-cvar_t		gl_max_size = {"gl_max_size", "1024"};
-cvar_t		gl_picmip = {"gl_picmip", "0"};
-cvar_t		gl_lerpimages = {"gl_lerpimages", "1"};
-cvar_t		r_upload = {"r_upload", "1"};
+int		gl_filter_min = GL_LINEAR_MIPMAP_LINEAR;
+int		gl_filter_mag = GL_LINEAR;
 
-int		gl_filter_min = GL_LINEAR_MIPMAP_LINEAR; //NEAREST;
-int		gl_filter_max = GL_LINEAR;
 
+static mempool_t *texturemempool;
+static mempool_t *texturedatamempool;
+static mempool_t *textureprocessingmempool;
 
-int		texels;
+// note: this must not conflict with TEXF_ flags in r_textures.h
+// cleared when a texture is uploaded
+#define GLTEXF_UPLOAD 0x00010000
+// bitmask for mismatch checking
+#define GLTEXF_IMPORTANTBITS (0)
+// set when image is uploaded and freed
+#define GLTEXF_DESTROYED 0x00040000
 
-// 4096x4096
-#define MAXMIPS 12
+// size of images which hold fragment textures, ignores picmip and max_size
+static int block_size;
 
 typedef struct
 {
-	int		texnum;
-	int		texeldatasize;
-	byte	*texels[MAXMIPS];
-	unsigned short texelsize[MAXMIPS][2];
-	char	identifier[64];
-	short	width, height;
-// LordHavoc: CRC to identify cache mismatchs
-	unsigned short crc;
-	char	mipmap;
-	char	alpha;
-	char	bytesperpixel;
-	char	lerped; // whether this texture was uploaded with or without interpolation
-} gltexture_t;
-
-#define	MAX_GLTEXTURES	4096
-gltexture_t	gltextures[MAX_GLTEXTURES];
-int			numgltextures;
+	int textype;
+	int inputbytesperpixel;
+	int internalbytesperpixel;
+	int glformat;
+	int glinternalformat;
+}
+textypeinfo_t;
+
+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};
+
+// 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 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, 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 (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
+	struct gltexture_s *chain;
+	// pointer into gltextureimage array
+	gltextureimage_t *image;
+	// name of the texture (this might be removed someday), no duplicates
+	char *identifier;
+	// location in the image, and size
+	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;
+	// 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;
+
+#define TEXTUREPOOL_SENTINEL 0xC0DEDBAD
+
+typedef struct gltexturepool_s
+{
+	int sentinel;
+	struct gltextureimage_s *imagechain;
+	struct gltexture_s *gltchain;
+	struct gltexturepool_s *next;
+}
+gltexturepool_t;
+
+static gltexturepool_t *gltexturepoolchain = NULL;
+
+static qbyte *resizebuffer = NULL, *colorconvertbuffer;
+static int resizebuffersize = 0;
+static qbyte *texturebuffer;
+static int texturebuffersize = 0;
+
+static int realmaxsize = 0;
+
+static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
+{
+	if (flags & TEXF_ALPHA)
+	{
+		switch(textype)
+		{
+		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;
+		case TEXTYPE_RGBA:
+			return &textype_rgba_alpha;
+		default:
+			Host_Error("R_GetTexTypeInfo: unknown texture format\n");
+			return NULL;
+		}
+	}
+	else
+	{
+		switch(textype)
+		{
+		case TEXTYPE_PALETTE:
+			return &textype_palette;
+		case TEXTYPE_RGB:
+			return &textype_rgb;
+		case TEXTYPE_RGBA:
+			return &textype_rgba;
+		default:
+			Host_Error("R_GetTexTypeInfo: unknown texture format\n");
+			return NULL;
+		}
+	}
+}
+
+static void R_UploadTexture(gltexture_t *t);
+
+static void R_PrecacheTexture(gltexture_t *glt)
+{
+	int precache;
+	precache = false;
+	if (glt->flags & TEXF_ALWAYSPRECACHE)
+		precache = true;
+	else if (r_precachetextures.integer >= 2)
+		precache = true;
+	else if (r_precachetextures.integer >= 1)
+		if (glt->flags & TEXF_PRECACHE)
+			precache = true;
+
+	if (precache)
+		R_UploadTexture(glt);
+}
+
+int R_RealGetTexture(rtexture_t *rt)
+{
+	if (rt)
+	{
+		gltexture_t *glt;
+		glt = (gltexture_t *)rt;
+		if (glt->flags & GLTEXF_UPLOAD)
+			R_UploadTexture(glt);
+		glt->texnum = glt->image->texnum;
+		return glt->image->texnum;
+	}
+	else
+		return 0;
+}
+
+void R_FreeTexture(rtexture_t *rt)
+{
+	gltexture_t *glt, **gltpointer;
+	gltextureimage_t *image, **gltimagepointer;
+
+	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 \"%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)
+	{
+		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 (glt->identifier)
+		Mem_Free(glt->identifier);
+	if (glt->inputtexels)
+		Mem_Free(glt->inputtexels);
+	Mem_Free(glt);
+}
+
+/*
+static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier)
+{
+	gltexture_t	*glt;
+
+	if (!identifier)
+		return NULL;
+
+	for (glt = pool->gltchain;glt;glt = glt->chain)
+		if (glt->identifier && !strcmp (identifier, glt->identifier))
+			return glt;
+
+	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;
+	pool->next = gltexturepoolchain;
+	gltexturepoolchain = pool;
+	pool->sentinel = TEXTUREPOOL_SENTINEL;
+	return (rtexturepool_t *)pool;
+}
+
+void R_FreeTexturePool(rtexturepool_t **rtexturepool)
+{
+	gltexturepool_t *pool, **poolpointer;
+	if (rtexturepool == NULL)
+		return;
+	if (*rtexturepool == NULL)
+		return;
+	pool = (gltexturepool_t *)(*rtexturepool);
+	*rtexturepool = NULL;
+	if (pool->sentinel != TEXTUREPOOL_SENTINEL)
+		Host_Error("R_FreeTexturePool: pool already freed\n");
+	for (poolpointer = &gltexturepoolchain;*poolpointer && *poolpointer != pool;poolpointer = &(*poolpointer)->next);
+	if (*poolpointer == pool)
+		*poolpointer = pool->next;
+	else
+		Host_Error("R_FreeTexturePool: pool not linked\n");
+	while (pool->gltchain)
+		R_FreeTexture((rtexture_t *)pool->gltchain);
+	if (pool->imagechain)
+		Sys_Error("R_FreeTexturePool: not all images freed\n");
+	Mem_Free(pool);
+}
+
 
 typedef struct
 {
 	char *name;
-	int	minimize, maximize;
-} glmode_t;
+	int minification, magnification;
+}
+glmode_t;
 
-glmode_t modes[] = {
+static glmode_t modes[] =
+{
 	{"GL_NEAREST", GL_NEAREST, GL_NEAREST},
 	{"GL_LINEAR", GL_LINEAR, GL_LINEAR},
 	{"GL_NEAREST_MIPMAP_NEAREST", GL_NEAREST_MIPMAP_NEAREST, GL_NEAREST},
@@ -49,590 +316,863 @@ glmode_t modes[] = {
 	{"GL_LINEAR_MIPMAP_LINEAR", GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR}
 };
 
-/*
-===============
-Draw_TextureMode_f
-===============
-*/
-void Draw_TextureMode_f (void)
+extern int gl_backend_rebindtextures;
+
+static void GL_TextureMode_f (void)
 {
-	int		i;
-	gltexture_t	*glt;
+	int i;
+	gltextureimage_t *image;
+	gltexturepool_t *pool;
 
 	if (Cmd_Argc() == 1)
 	{
-		for (i=0 ; i< 6 ; i++)
-			if (gl_filter_min == modes[i].minimize)
+		for (i = 0;i < 6;i++)
+		{
+			if (gl_filter_min == modes[i].minification)
 			{
 				Con_Printf ("%s\n", modes[i].name);
 				return;
 			}
+		}
 		Con_Printf ("current filter is unknown???\n");
 		return;
 	}
 
-	for (i=0 ; i< 6 ; i++)
-	{
+	for (i = 0;i < 6;i++)
 		if (!Q_strcasecmp (modes[i].name, Cmd_Argv(1) ) )
 			break;
-	}
 	if (i == 6)
 	{
 		Con_Printf ("bad filter name\n");
 		return;
 	}
 
-	gl_filter_min = modes[i].minimize;
-	gl_filter_max = modes[i].maximize;
+	gl_filter_min = modes[i].minification;
+	gl_filter_mag = modes[i].magnification;
 
-	if (!r_upload.value)
-		return;
 	// change all the existing mipmap texture objects
-	for (i=0, glt=gltextures ; i<numgltextures ; i++, glt++)
+	// FIXME: force renderer(/client/something?) restart instead?
+	for (pool = gltexturepoolchain;pool;pool = pool->next)
 	{
-		if (glt->mipmap)
+		for (image = pool->imagechain;image;image = image->imagechain)
 		{
-			glBindTexture(GL_TEXTURE_2D, glt->texnum);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
+			// only update already uploaded images
+			if (!(image->flags & GLTEXF_UPLOAD))
+			{
+				qglBindTexture(GL_TEXTURE_2D, image->texnum);
+				if (image->flags & TEXF_MIPMAP)
+					qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+				else
+					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;
 }
 
-void GL_TextureStats_Print(char *name, int total, int crc, int mip, int alpha)
+static int R_CalcTexelDataSize (gltexture_t *glt)
 {
-	char n[64];
-	int c = 0;
-	if (!name[0])
-		name = "<unnamed>";
-	while (name[c] && c < 28)
-		n[c++] = name[c];
-	// no need to pad since the name was moved to last
-//	while (c < 28)
-//		n[c++] = ' ';
-	n[c] = 0;
-	Con_Printf("%5i %04X %s %s %s\n", total, crc, mip ? "yes" : "no ", alpha ? "yes  " : "no   ", n);
+	int width2, height2, depth2, size;
+	if (glt->flags & TEXF_FRAGMENT)
+		size = glt->width * glt->height * glt->depth;
+	else
+	{
+		if (r_max_size.integer > realmaxsize)
+			Cvar_SetValue("r_max_size", realmaxsize);
+		// calculate final size
+		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 >>= r_picmip.integer;width2 > r_max_size.integer;width2 >>= 1);
+		for (height2 >>= r_picmip.integer;height2 > r_max_size.integer;height2 >>= 1);
+		for (depth2 >>= r_picmip.integer;depth2 > r_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 || depth2 > 1)
+			{
+				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 * depth2;
+	}
+	size *= glt->textype->internalbytesperpixel * glt->image->sides;
+
+	return size;
 }
 
-void GL_TextureStats_f(void)
+void R_TextureStats_PrintTotal(void)
 {
-	int i, s = 0, sc = 0, t = 0;
+	int glsize, total = 0, totalt = 0, totalp = 0, loaded = 0, loadedt = 0, loadedp = 0;
 	gltexture_t *glt;
-	Con_Printf("kbytes crc  mip alpha name\n");
-	for (i = 0, glt = gltextures;i < numgltextures;i++, glt++)
+	gltexturepool_t *pool;
+	for (pool = gltexturepoolchain;pool;pool = pool->next)
 	{
-		GL_TextureStats_Print(glt->identifier, (glt->texeldatasize + 512) >> 10, glt->crc, glt->mipmap, glt->alpha);
-		t += glt->texeldatasize;
-		if (glt->identifier[0] == '&')
+		for (glt = pool->gltchain;glt;glt = glt->chain)
 		{
-			sc++;
-			s += glt->texeldatasize;
+			glsize = R_CalcTexelDataSize(glt);
+			total++;
+			totalt += glsize;
+			totalp += glt->inputdatasize;
+			if (!(glt->flags & GLTEXF_UPLOAD))
+			{
+				loaded++;
+				loadedt += glsize;
+				loadedp += glt->inputdatasize;
+			}
 		}
 	}
-	Con_Printf("%i textures, totalling %.3fMB, %i are (usually) unnecessary model skins totalling %.3fMB\n", numgltextures, t / 1048576.0, sc, s / 1048576.0);
+	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);
 }
 
-void GL_TextureStats_PrintTotal(void)
+static void R_TextureStats_f(void)
 {
-	int i, s = 0, sc = 0, t = 0;
+	int loaded;
 	gltexture_t *glt;
-	for (i = 0, glt = gltextures;i < numgltextures;i++, glt++)
+	gltexturepool_t *pool;
+	Con_Printf("glsize input loaded mip alpha name\n");
+	for (pool = gltexturepoolchain;pool;pool = pool->next)
 	{
-		t += glt->texeldatasize;
-		if (glt->identifier[0] == '&')
+		for (glt = pool->gltchain;glt;glt = glt->chain)
 		{
-			sc++;
-			s += glt->texeldatasize;
+			loaded = !(glt->flags & GLTEXF_UPLOAD);
+			Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', loaded ? "loaded" : "      ", (glt->flags & TEXF_MIPMAP) ? "mip" : "   ", (glt->flags & TEXF_ALPHA) ? "alpha" : "     ", glt->identifier ? glt->identifier : "<unnamed>");
 		}
+		Con_Printf("pool %10p\n", pool);
 	}
-	Con_Printf("%i textures, totalling %.3fMB, %i are (usually) unnecessary model skins totalling %.3fMB\n", numgltextures, t / 1048576.0, sc, s / 1048576.0);
+	R_TextureStats_PrintTotal();
 }
 
 char engineversion[40];
 
-void GL_UploadTexture (gltexture_t *glt);
-void gl_textures_start()
+static void r_textures_start(void)
 {
-	int i;
-	gltexture_t *glt;
-	for (i=0, glt=gltextures ; i<numgltextures ; i++, glt++)
-		GL_UploadTexture(glt);
+	// deal with size limits of various drivers (3dfx in particular)
+	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);
+
+	texturemempool = Mem_AllocPool("Texture Info");
+	texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)");
+	textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers");
+}
+
+static void r_textures_shutdown(void)
+{
+	rtexturepool_t *temp;
+	while(gltexturepoolchain)
+	{
+		temp = (rtexturepool_t *) gltexturepoolchain;
+		R_FreeTexturePool(&temp);
+	}
+
+	resizebuffersize = 0;
+	texturebuffersize = 0;
+	resizebuffer = NULL;
+	colorconvertbuffer = NULL;
+	texturebuffer = NULL;
+	Mem_FreePool(&texturemempool);
+	Mem_FreePool(&texturedatamempool);
+	Mem_FreePool(&textureprocessingmempool);
 }
 
-void gl_textures_shutdown()
+static void r_textures_newmap(void)
 {
 }
 
-void GL_Textures_Init (void)
+void R_Textures_Init (void)
 {
-	Cmd_AddCommand("r_texturestats", GL_TextureStats_f);
-	Cvar_RegisterVariable (&gl_max_size);
-	Cvar_RegisterVariable (&gl_picmip);
-	Cvar_RegisterVariable (&gl_lerpimages);
-	Cvar_RegisterVariable (&r_upload);
-#ifdef NORENDER
-	r_upload.value = 0;
-#endif
+	Cmd_AddCommand("gl_texturemode", &GL_TextureMode_f);
+	Cmd_AddCommand("r_texturestats", R_TextureStats_f);
+	Cvar_RegisterVariable (&r_max_scrapsize);
+	Cvar_RegisterVariable (&r_max_size);
+	Cvar_RegisterVariable (&r_picmip);
+	Cvar_RegisterVariable (&r_lerpimages);
+	Cvar_RegisterVariable (&r_precachetextures);
 
-	// 3dfx can only handle 256 wide textures
-	if (!Q_strncasecmp ((char *)gl_renderer, "3dfx",4) || strstr((char *)gl_renderer, "Glide"))
-		Cvar_Set ("gl_max_size", "256");
+	R_RegisterModule("R_Textures", r_textures_start, r_textures_shutdown, r_textures_newmap);
+}
 
-	Cmd_AddCommand ("gl_texturemode", &Draw_TextureMode_f);
+void R_Textures_Frame (void)
+{
+	// could do procedural texture animation here, if we keep track of which
+	// textures were accessed this frame...
 
-	R_RegisterModule("GL_Textures", gl_textures_start, gl_textures_shutdown);
+	// free the resize buffers
+	resizebuffersize = 0;
+	if (resizebuffer)
+	{
+		Mem_Free(resizebuffer);
+		resizebuffer = NULL;
+	}
+	if (colorconvertbuffer)
+	{
+		Mem_Free(colorconvertbuffer);
+		colorconvertbuffer = NULL;
+	}
 }
 
-/*
-================
-GL_FindTexture
-================
-*/
-int GL_FindTexture (char *identifier)
+void R_MakeResizeBufferBigger(int size)
 {
-	int		i;
-	gltexture_t	*glt;
-
-	for (i=0, glt=gltextures ; i<numgltextures ; i++, glt++)
+	if (resizebuffersize < size)
 	{
-		if (!strcmp (identifier, glt->identifier))
-			return gltextures[i].texnum;
+		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");
 	}
+}
 
-	return -1;
+static void GL_SetupTextureParameters(int flags, int texturetype)
+{
+	int textureenum = gltexturetypeenums[texturetype];
+	int wrapmode = (flags & TEXF_CLAMP) ? GL_CLAMP : GL_REPEAT;
+
+	CHECKGLERROR
+
+	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode);
+	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode);
+	if (gltexturetypedimensions[texturetype] >= 3)
+		qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode);
+
+	if (flags & TEXF_MIPMAP)
+		qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+	else
+		qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+	qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+
+	CHECKGLERROR
 }
 
-void GL_ResampleTextureLerpLine (byte *in, byte *out, int inwidth, int outwidth)
+static void R_Upload(gltexture_t *glt, qbyte *data)
 {
-	int		j, xi, oldx = 0, f, fstep, l1, l2, endx;
-	fstep = (int) (inwidth*65536.0f/outwidth);
-	endx = (inwidth-1);
-	for (j = 0,f = 0;j < outwidth;j++, f += fstep)
+	int i, mip, width, height, depth, internalformat;
+	qbyte *prevbuffer;
+	prevbuffer = data;
+
+	CHECKGLERROR
+
+	glt->texnum = glt->image->texnum;
+	qglBindTexture(gltexturetypeenums[glt->image->texturetype], glt->image->texnum);
+	CHECKGLERROR
+	glt->flags &= ~GLTEXF_UPLOAD;
+	gl_backend_rebindtextures = true;
+
+	if (glt->flags & TEXF_FRAGMENT)
 	{
-		xi = (int) f >> 16;
-		if (xi != oldx)
+		if (glt->image->flags & GLTEXF_UPLOAD)
+		{
+			glt->image->flags &= ~GLTEXF_UPLOAD;
+			Con_DPrintf("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)
 		{
-			in += (xi - oldx) * 4;
-			oldx = xi;
+			R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
+			memset(resizebuffer, 255, glt->width * glt->height * glt->image->depth * glt->image->bytesperpixel);
+			prevbuffer = resizebuffer;
 		}
-		if (xi < endx)
+		else if (glt->textype->textype == TEXTYPE_PALETTE)
 		{
-			l2 = f & 0xFFFF;
-			l1 = 0x10000 - l2;
-			*out++ = (byte) ((in[0] * l1 + in[4] * l2) >> 16);
-			*out++ = (byte) ((in[1] * l1 + in[5] * l2) >> 16);
-			*out++ = (byte) ((in[2] * l1 + in[6] * l2) >> 16);
-			*out++ = (byte) ((in[3] * l1 + in[7] * l2) >> 16);
+			// 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->depth * glt->image->sides * glt->image->bytesperpixel);
+			Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth, glt->palette);
+			prevbuffer = colorconvertbuffer;
+		}
+
+		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 // last pixel of the line has no pixel to lerp to
+		glt->texnum = glt->image->texnum;
+		return;
+	}
+
+	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);
+
+	R_MakeResizeBufferBigger(width * height * depth * glt->image->sides * glt->image->bytesperpixel);
+
+	if (prevbuffer == NULL)
+	{
+		width = glt->image->width;
+		height = glt->image->height;
+		depth = glt->image->depth;
+		memset(resizebuffer, 255, width * height * depth * glt->image->bytesperpixel);
+		prevbuffer = resizebuffer;
+	}
+	else
+	{
+		if (glt->textype->textype == TEXTYPE_PALETTE)
 		{
-			*out++ = in[0];
-			*out++ = in[1];
-			*out++ = in[2];
-			*out++ = in[3];
+			// 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;
 		}
 	}
-}
 
-/*
-================
-GL_ResampleTexture
-================
-*/
-void GL_ResampleTexture (void *indata, int inwidth, int inheight, void *outdata,  int outwidth, int outheight)
-{
-	if (gl_lerpimages.value)
+	// 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;
+
+	// cubemaps contain multiple images and thus get processed a bit differently
+	if (glt->image->texturetype != GLTEXTURETYPE_CUBEMAP)
 	{
-		int		i, j, yi, oldy, f, fstep, l1, l2, endy = (inheight-1);
-		byte	*inrow, *out, *row1, *row2;
-		out = outdata;
-		fstep = (int) (inheight*65536.0f/outheight);
-
-		row1 = qmalloc(outwidth*4);
-		row2 = qmalloc(outwidth*4);
-		inrow = indata;
-		oldy = 0;
-		GL_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth);
-		GL_ResampleTextureLerpLine (inrow + inwidth*4, row2, inwidth, outwidth);
-		for (i = 0, f = 0;i < outheight;i++,f += fstep)
+		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)
 		{
-			yi = f >> 16;
-			if (yi != oldy)
+			Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel);
+			prevbuffer = resizebuffer;
+		}
+	}
+	mip = 0;
+	switch(glt->image->texturetype)
+	{
+	case GLTEXTURETYPE_1D:
+		qglTexImage1D(GL_TEXTURE_1D, mip++, internalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+		CHECKGLERROR
+		if (glt->flags & TEXF_MIPMAP)
+		{
+			while (width > 1 || height > 1 || depth > 1)
 			{
-				inrow = (byte *)indata + inwidth*4*yi;
-				if (yi == oldy+1)
-					memcpy(row1, row2, outwidth*4);
-				else
-					GL_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth);
-				if (yi < endy)
-					GL_ResampleTextureLerpLine (inrow + inwidth*4, row2, inwidth, outwidth);
-				else
-					memcpy(row2, row1, outwidth*4);
-				oldy = yi;
+				Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+				prevbuffer = resizebuffer;
+				qglTexImage1D(GL_TEXTURE_1D, mip++, internalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+				CHECKGLERROR
 			}
-			if (yi < endy)
+		}
+		break;
+	case GLTEXTURETYPE_2D:
+		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 || depth > 1)
 			{
-				l2 = f & 0xFFFF;
-				l1 = 0x10000 - l2;
-				for (j = 0;j < outwidth;j++)
-				{
-					*out++ = (byte) ((*row1++ * l1 + *row2++ * l2) >> 16);
-					*out++ = (byte) ((*row1++ * l1 + *row2++ * l2) >> 16);
-					*out++ = (byte) ((*row1++ * l1 + *row2++ * l2) >> 16);
-					*out++ = (byte) ((*row1++ * l1 + *row2++ * l2) >> 16);
-				}
-				row1 -= outwidth*4;
-				row2 -= outwidth*4;
+				Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+				prevbuffer = resizebuffer;
+				qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+				CHECKGLERROR
 			}
-			else // last line has no pixels to lerp to
+		}
+		break;
+	case GLTEXTURETYPE_3D:
+		qglTexImage3D(GL_TEXTURE_3D, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+		CHECKGLERROR
+		if (glt->flags & TEXF_MIPMAP)
+		{
+			while (width > 1 || height > 1 || depth > 1)
 			{
-				for (j = 0;j < outwidth;j++)
-				{
-					*out++ = *row1++;
-					*out++ = *row1++;
-					*out++ = *row1++;
-					*out++ = *row1++;
-				}
-				row1 -= outwidth*4;
+				Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+				prevbuffer = resizebuffer;
+				qglTexImage3D(GL_TEXTURE_3D, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+				CHECKGLERROR
 			}
 		}
-		qfree(row1);
-		qfree(row2);
-	}
-	else
-	{
-		int		i, j;
-		unsigned	frac, fracstep;
-		byte	*inrow, *out, *inpix;
-		out = outdata;
-
-		fracstep = inwidth*0x10000/outwidth;
-		for (i=0 ; i<outheight ; i++)
+		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++)
 		{
-			inrow = (byte *)indata + inwidth*(i*inheight/outheight)*4;
-			frac = fracstep >> 1;
-			for (j=0 ; j<outwidth ; j+=4)
+			prevbuffer = texturebuffer;
+			texturebuffer += width * height * depth * glt->textype->inputbytesperpixel;
+			if (glt->width != width || glt->height != height || glt->depth != depth)
 			{
-				inpix = inrow + ((frac >> 14) & ~3);*out++ = qgamma[*inpix++];*out++ = qgamma[*inpix++];*out++ = qgamma[*inpix++];*out++ =       *inpix++ ;frac += fracstep;
-				inpix = inrow + ((frac >> 14) & ~3);*out++ = qgamma[*inpix++];*out++ = qgamma[*inpix++];*out++ = qgamma[*inpix++];*out++ =       *inpix++ ;frac += fracstep;
-				inpix = inrow + ((frac >> 14) & ~3);*out++ = qgamma[*inpix++];*out++ = qgamma[*inpix++];*out++ = qgamma[*inpix++];*out++ =       *inpix++ ;frac += fracstep;
-				inpix = inrow + ((frac >> 14) & ~3);*out++ = qgamma[*inpix++];*out++ = qgamma[*inpix++];*out++ = qgamma[*inpix++];*out++ =       *inpix++ ;frac += fracstep;
+				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++, internalformat, 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++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+					CHECKGLERROR
+				}
 			}
 		}
+		break;
 	}
+	GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype);
 }
 
-void GL_FreeTexels(gltexture_t *glt)
+static void R_FindImageForTexture(gltexture_t *glt)
 {
-	if (glt->texels[0])
-		qfree(glt->texels[0]);
-	glt->texels[0] = 0;
-}
+	int i, j, best, best2, x, y, z, w, h, d;
+	textypeinfo_t *texinfo;
+	gltexturepool_t *pool;
+	gltextureimage_t *image, **imagechainpointer;
+	texinfo = glt->textype;
+	pool = glt->pool;
 
-void GL_AllocTexels(gltexture_t *glt, int width, int height, int mipmapped)
-{
-	int i, w, h, size;
-	if (glt->texels[0])
-		GL_FreeTexels(glt);
-	glt->texelsize[0][0] = width;
-	glt->texelsize[0][1] = height;
-	if (mipmapped)
+	// 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)
 	{
-		size = 0;
-		w = width;h = height;
-		i = 0;
-		while (i < MAXMIPS)
+		for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain)
 		{
-			glt->texelsize[i][0] = w;
-			glt->texelsize[i][1] = h;
-			glt->texels[i++] = (void *)size;
-			size += w*h*4;
-			if (w > 1)
+			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
+			for (best = image->width, i = 0;i < image->width - w;i++)
 			{
-				w >>= 1;
-				if (h > 1)
-					h >>= 1;
+				for (best2 = 0, j = 0;j < w;j++)
+				{
+					if (image->blockallocation[i+j] >= best)
+						break;
+					if (best2 < image->blockallocation[i+j])
+						best2 = image->blockallocation[i+j];
+				}
+				if (j == w)
+				{
+					// this is a valid spot
+					x = i;
+					y = best = best2;
+				}
 			}
-			else if (h > 1)
-				h >>= 1;
-			else
-				break;
+
+			if (best + h > image->height)
+				continue;
+
+			for (i = 0;i < w;i++)
+				image->blockallocation[x + i] = best + h;
+
+			glt->x = x;
+			glt->y = y;
+			glt->z = 0;
+			glt->image = image;
+			image->texturecount++;
+			return;
 		}
-		glt->texeldatasize = size;
-		while (i < MAXMIPS)
-			glt->texels[i++] = NULL;
-		glt->texels[0] = qmalloc(size);
-		for (i = 1;i < MAXMIPS && glt->texels[i];i++)
-			glt->texels[i] += (int) glt->texels[0];
+
+		image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
+		if (image == NULL)
+			Sys_Error("R_FindImageForTexture: ran out of memory\n");
+		image->type = GLIMAGETYPE_FRAGMENTS;
+		// 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;
 	}
 	else
 	{
-		size = width*height*4;
-		glt->texeldatasize = size;
-		glt->texels[0] = qmalloc(size);
-		for (i = 1;i < MAXMIPS;i++)
-			glt->texels[i] = NULL;
+		for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain);
+
+		image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
+		if (image == NULL)
+			Sys_Error("R_FindImageForTexture: ran out of memory\n");
+		image->type = GLIMAGETYPE_TILE;
+		image->blockallocation = NULL;
+
+		// calculate final size
+		if (r_max_size.integer > realmaxsize)
+			Cvar_SetValue("r_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 >>= r_picmip.integer;image->width > r_max_size.integer;image->width >>= 1);
+		for (image->height >>= r_picmip.integer;image->height > r_max_size.integer;image->height >>= 1);
+		for (image->depth >>= r_picmip.integer;image->depth > r_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;
 	}
-	if (!glt->texels[0])
-		Sys_Error("GL_AllocTexels: out of memory\n");
+	image->texturetype = glt->texturetype;
+	image->glinternalformat = texinfo->glinternalformat;
+	image->glformat = texinfo->glformat;
+	image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP)) | GLTEXF_UPLOAD;
+	image->bytesperpixel = texinfo->internalbytesperpixel;
+	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;
 }
 
-// in can be the same as out
-void GL_MipReduce(byte *in, byte *out, int width, int height, int destwidth, int destheight)
+// note: R_FindImageForTexture must be called before this
+static void R_UploadTexture (gltexture_t *glt)
 {
-	int x, y, width2, height2, nextrow;
-	if (width > destwidth)
+	if (!(glt->flags & GLTEXF_UPLOAD))
+		return;
+
+	R_Upload(glt, glt->inputtexels);
+	if (glt->inputtexels)
 	{
-		if (height > destheight)
-		{
-			// reduce both
-			width2 = width >> 1;
-			height2 = height >> 1;
-			nextrow = width << 2;
-			for (y = 0;y < height2;y++)
-			{
-				for (x = 0;x < width2;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
+		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 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, size;
+	gltexture_t *glt;
+	gltexturepool_t *pool = (gltexturepool_t *)rtexturepool;
+	textypeinfo_t *texinfo;
+
+	if (cls.state == ca_dedicated)
+		return NULL;
+
+	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");
+
+	/*
+	glt = R_FindTexture (pool, identifier);
+	if (glt)
+	{
+		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;
+
+	// clear the alpha flag if the texture has no transparent pixels
+	switch(textype)
+	{
+	case TEXTYPE_PALETTE:
+		if (flags & TEXF_ALPHA)
 		{
-			// reduce width
-			width2 = width >> 1;
-			for (y = 0;y < height;y++)
+			flags &= ~TEXF_ALPHA;
+			if (data)
 			{
-				for (x = 0;x < width2;x++)
+				for (i = 0;i < size;i++)
 				{
-					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;
+					if (((qbyte *)&palette[data[i]])[3] == 255)
+					{
+						flags |= TEXF_ALPHA;
+						break;
+					}
 				}
 			}
 		}
-	}
-	else
-	{
-		if (height > destheight)
+		break;
+	case TEXTYPE_RGB:
+		if (flags & TEXF_ALPHA)
+			Host_Error("R_LoadTexture: RGB has no alpha, don't specify TEXF_ALPHA\n");
+		break;
+	case TEXTYPE_RGBA:
+		if (flags & TEXF_ALPHA)
 		{
-			// reduce height
-			height2 = height >> 1;
-			nextrow = width << 2;
-			for (y = 0;y < height2;y++)
+			flags &= ~TEXF_ALPHA;
+			if (data)
 			{
-				for (x = 0;x < width;x++)
+				for (i = 3;i < size;i += 4)
 				{
-					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;
+					if (data[i] < 255)
+					{
+						flags |= TEXF_ALPHA;
+						break;
+					}
 				}
-				in += nextrow; // skip a line
 			}
 		}
-		else
-			Sys_Error("GL_MipReduce: desired size already achieved\n");
+		break;
+	default:
+		Host_Error("R_LoadTexture: unknown texture type\n");
 	}
-}
 
-void GL_UploadTexture (gltexture_t *glt)
-{
-	int mip, width, height;
-	if (!r_upload.value)
-		return;
-	glBindTexture(GL_TEXTURE_2D, glt->texnum);
-	width = glt->width;
-	height = glt->height;
-	for (mip = 0;mip < MAXMIPS && glt->texels[mip];mip++)
-		glTexImage2D(GL_TEXTURE_2D, mip, glt->alpha ? 4 : 3, glt->texelsize[mip][0], glt->texelsize[mip][1], 0, GL_RGBA, GL_UNSIGNED_BYTE, glt->texels[mip]);
-	if (glt->mipmap)
+	glt = Mem_Alloc(texturemempool, sizeof(gltexture_t));
+	if (identifier)
 	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
+		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->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;
+
+	if (data)
 	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
+		glt->inputtexels = Mem_Alloc(texturedatamempool, size);
+		if (glt->inputtexels == NULL)
+			Sys_Error("R_SetupTexture: out of memory\n");
+		memcpy(glt->inputtexels, data, size);
 	}
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+	else
+		glt->inputtexels = NULL;
+
+	R_FindImageForTexture(glt);
+	R_PrecacheTexture(glt);
+
+	return (rtexture_t *)glt;
 }
 
-/*
-================
-GL_LoadTexture
-================
-*/
-int GL_LoadTexture (char *identifier, int width, int height, byte *data, qboolean mipmap, qboolean alpha, int bytesperpixel)
+rtexture_t *R_LoadTexture1D(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, 1, 1, 1, flags, textype, GLTEXTURETYPE_1D, data, palette);
+}
+
+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);
+}
+
+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);
+}
+
+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)
+{
+	return rt ? (((gltexture_t *)rt)->flags & TEXF_ALPHA) != 0 : false;
+}
+
+int R_TextureWidth(rtexture_t *rt)
 {
-	unsigned short	crc;
-	int				i, width2, height2, width3, height3, w, h, mip;
-	gltexture_t		*glt;
+	return rt ? ((gltexture_t *)rt)->width : 0;
+}
 
-	if (isDedicated)
-		return 1;
+int R_TextureHeight(rtexture_t *rt)
+{
+	return rt ? ((gltexture_t *)rt)->height : 0;
+}
 
-	// LordHavoc: do a CRC to confirm the data really is the same as previous occurances.
-	crc = CRC_Block(data, width*height*bytesperpixel);
-	// see if the texture is already present
-	if (identifier[0])
+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, idepth;
+	if (cls.state == ca_dedicated)
 	{
-		for (i=0, glt=gltextures ; i<numgltextures ; i++, glt++)
+		if (x)
+			*x = 0;
+		if (y)
+			*y = 0;
+		if (z)
+			*z = 0;
+		if (fx1 || fy1 || fx2 || fy2)
 		{
-			if (!strcmp (identifier, glt->identifier))
-			{
-				// LordHavoc: everyone hates cache mismatchs, so I fixed it
-				if (crc != glt->crc || width != glt->width || height != glt->height)
-				{
-					Con_DPrintf("GL_LoadTexture: cache mismatch, replacing old texture\n");
-					goto GL_LoadTexture_setup; // drop out with glt pointing to the texture to replace
-				}
-				if ((gl_lerpimages.value != 0) != glt->lerped)
-					goto GL_LoadTexture_setup; // drop out with glt pointing to the texture to replace
-				return glt->texnum;
-			}
+			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;
 	}
-	// LordHavoc: although this could be an else condition as it was in the original id code,
-	//            it is more clear this way
-	// LordHavoc: check if there are still slots available
-	if (numgltextures >= MAX_GLTEXTURES)
-		Sys_Error ("GL_LoadTexture: ran out of texture slots (%d)\n", MAX_GLTEXTURES);
-	glt = &gltextures[numgltextures++];
-
-	strcpy (glt->identifier, identifier);
-	glt->texnum = texture_extension_number;
-	texture_extension_number++;
-// LordHavoc: label to drop out of the loop into the setup code
-GL_LoadTexture_setup:
-	// calculate power of 2 size
-	width2 = 1;while (width2 < width) width2 <<= 1;
-	height2 = 1;while (height2 < height) height2 <<= 1;
-	// calculate final size (mipmapped downward to this)
-	width3 = width2 >> (int) gl_picmip.value;
-	height3 = height2 >> (int) gl_picmip.value;
-	while (width3 > (int) gl_max_size.value) width3 >>= 1;
-	while (height3 > (int) gl_max_size.value) height3 >>= 1;
-	if (width3 < 1) width3 = 1;
-	if (height3 < 1) height3 = 1;
-
-	// final storage
-	GL_AllocTexels(glt, width3, height3, mipmap);
-	glt->crc = crc; // LordHavoc: used to verify textures are identical
-	glt->width = width;
-	glt->height = height;
-	glt->mipmap = mipmap;
-	glt->bytesperpixel = bytesperpixel;
-	glt->lerped = gl_lerpimages.value != 0;
-	glt->alpha = false; // updated later
-	if (width == width3 && height == height3) // perfect match
-	{
-		if (bytesperpixel == 1) // 8bit
-			Image_Copy8bitRGBA(data, glt->texels[0], width*height, d_8to24table);
-		else
-			Image_CopyRGBAGamma(data, glt->texels[0], width*height);
-	}
-	else if (width == width2 && height == height2) // perfect match for top level, but needs to be reduced
+	if (!rt)
+		Host_Error("R_FragmentLocation: no texture supplied\n");
+	glt = (gltexture_t *)rt;
+	if (glt->flags & TEXF_FRAGMENT)
 	{
-		byte *temptexels2;
-		temptexels2 = qmalloc(width2*height2*4); // scaleup buffer
-		if (bytesperpixel == 1) // 8bit
-			Image_Copy8bitRGBA(data, temptexels2, width*height, d_8to24table);
-		else
-			Image_CopyRGBAGamma(data, temptexels2, width*height);
-		while (width2 > width3 || height2 > height3)
+		if (x)
+			*x = glt->x;
+		if (y)
+			*y = glt->y;
+		if (fx1 || fy1 || fx2 || fy2)
 		{
-			w = width2;h = height2;
-			if (width2 > width3) width2 >>= 1;
-			if (height2 > height3) height2 >>= 1;
-			if (width2 <= width3 && height2 <= height3) // size achieved
-				GL_MipReduce(temptexels2, glt->texels[0], w, h, width3, height3);
-			else
-				GL_MipReduce(temptexels2, temptexels2, w, h, width3, height3);
+			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;
 		}
-		qfree(temptexels2);
 	}
-	else // scaling...
+	else
 	{
-		byte *temptexels;
-		// pre-scaleup buffer
-		temptexels = qmalloc(width*height*4);
-		if (bytesperpixel == 1) // 8bit
-			Image_Copy8bitRGBA(data, temptexels, width*height, d_8to24table);
-		else
-			Image_CopyRGBAGamma(data, temptexels, width*height);
-		if (width2 != width3 || height2 != height3) // reduced by gl_pic_mip or gl_max_size
+		if (x)
+			*x = 0;
+		if (y)
+			*y = 0;
+		if (z)
+			*z = 0;
+		if (fx1 || fy1 || fx2 || fy2)
 		{
-			byte *temptexels2;
-			temptexels2 = qmalloc(width2*height2*4); // scaleup buffer
-			GL_ResampleTexture(temptexels, width, height, temptexels2, width2, height2);
-			while (width2 > width3 || height2 > height3)
-			{
-				w = width2;h = height2;
-				if (width2 > width3) width2 >>= 1;
-				if (height2 > height3) height2 >>= 1;
-				if (width2 <= width3 && height2 <= height3) // size achieved
-					GL_MipReduce(temptexels2, glt->texels[0], w, h, width3, height3);
-				else
-					GL_MipReduce(temptexels2, temptexels2, w, h, width3, height3);
-			}
-			qfree(temptexels2);
+			if (fx1)
+				*fx1 = 0;
+			if (fy1)
+				*fy1 = 0;
+			if (fz1)
+				*fz1 = 0;
+			if (fx2)
+				*fx2 = 1;
+			if (fy2)
+				*fy2 = 1;
+			if (fz2)
+				*fz2 = 1;
 		}
-		else // copy directly
-			GL_ResampleTexture(temptexels, width, height, glt->texels[0], width2, height2);
-		qfree(temptexels);
-	}
-	if (alpha)
-	{
-		byte	*in = glt->texels[0] + 3;
-		for (i = 0;i < width*height;i++, in += 4)
-			if (*in < 255)
-			{
-				glt->alpha = true;
-				break;
-			}
 	}
-	// this loop is skipped if there are no mipmaps to generate
-	for (mip = 1;mip < MAXMIPS && glt->texels[mip];mip++)
-		GL_MipReduce(glt->texels[mip-1], glt->texels[mip], glt->texelsize[mip-1][0], glt->texelsize[mip-1][1], 1, 1);
-	GL_UploadTexture(glt);
-	GL_FreeTexels(glt);
+}
 
-//	if (bytesperpixel == 1) // 8bit
-//		GL_Upload8 (data, width, height, mipmap, alpha);
-//	else // 32bit
-//		GL_Upload32 (data, width, height, mipmap, true);
+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);
+}
 
-	return glt->texnum;
+int R_CompatibleFragmentWidth(int width, int textype, int flags)
+{
+	return width;
 }
 
-int GL_GetTextureSlots (int count)
+void R_UpdateTexture(rtexture_t *rt, qbyte *data)
 {
-	gltexture_t		*glt, *first;
+	gltexture_t *glt;
+	if (rt == NULL)
+		Host_Error("R_UpdateTexture: no texture supplied\n");
+	if (data == NULL)
+		Host_Error("R_UpdateTexture: no data supplied\n");
+	glt = (gltexture_t *)rt;
 
-	first = glt = &gltextures[numgltextures];
-	while (count--)
-	{
-		glt->identifier[0] = 0;
-		glt->texnum = texture_extension_number++;
-		glt->crc = 0;
-		glt->width = 0;
-		glt->height = 0;
-		glt->bytesperpixel = 0;
-		glt++;
-		numgltextures++;
-	}
-	return first->texnum;
+	// 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);
 }
+