X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=fe13aca500ea487f28821db2deb3aa87fe648aed;hb=f71636b5b494dda04c4fd29158eabc89f5eeaa55;hp=b39b3e3c5c6a25ca66d6a9dd02b85a702d8136d6;hpb=1c9dadb470e254303bacae8bc597a743d3265b0e;p=xonotic%2Fdarkplaces.git

diff --git a/gl_textures.c b/gl_textures.c
index b39b3e3c..fe13aca5 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -9,6 +9,16 @@ cvar_t gl_picmip = {CVAR_SAVE, "gl_picmip", "0", "reduces resolution of textures
 cvar_t r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1", "bilinear filters images when scaling them up to power of 2 size (mode 1), looks better than glquake (mode 0)"};
 cvar_t r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1", "0 = never upload textures until used, 1 = upload most textures before use (exceptions: rarely used skin colormap layers), 2 = upload all textures before use (can increase texture memory usage significantly)"};
 cvar_t gl_texture_anisotropy = {CVAR_SAVE, "gl_texture_anisotropy", "1", "anisotropic filtering quality (if supported by hardware), 1 sample (no anisotropy) and 8 sample (8 tap anisotropy) are recommended values"};
+cvar_t gl_texturecompression = {CVAR_SAVE, "gl_texturecompression", "0", "whether to compress textures, a value of 0 disables compression (even if the individual cvars are 1), 1 enables fast (low quality) compression at startup, 2 enables slow (high quality) compression at startup"};
+cvar_t gl_texturecompression_color = {CVAR_SAVE, "gl_texturecompression_color", "1", "whether to compress colormap (diffuse) textures"};
+cvar_t gl_texturecompression_normal = {CVAR_SAVE, "gl_texturecompression_normal", "0", "whether to compress normalmap (normalmap) textures"};
+cvar_t gl_texturecompression_gloss = {CVAR_SAVE, "gl_texturecompression_gloss", "1", "whether to compress glossmap (specular) textures"};
+cvar_t gl_texturecompression_glow = {CVAR_SAVE, "gl_texturecompression_glow", "1", "whether to compress glowmap (luma) textures"};
+cvar_t gl_texturecompression_2d = {CVAR_SAVE, "gl_texturecompression_2d", "0", "whether to compress 2d (hud/menu) textures other than the font"};
+cvar_t gl_texturecompression_q3bsplightmaps = {CVAR_SAVE, "gl_texturecompression_q3bsplightmaps", "0", "whether to compress lightmaps in q3bsp format levels"};
+cvar_t gl_texturecompression_q3bspdeluxemaps = {CVAR_SAVE, "gl_texturecompression_q3bspdeluxemaps", "0", "whether to compress deluxemaps in q3bsp format levels (only levels compiled with q3map2 -deluxe have these)"};
+cvar_t gl_texturecompression_sky = {CVAR_SAVE, "gl_texturecompression_sky", "0", "whether to compress sky textures"};
+cvar_t gl_texturecompression_lightcubemaps = {CVAR_SAVE, "gl_texturecompression_lightcubemaps", "1", "whether to compress light cubemaps (spotlights and other light projection images)"};
 
 int		gl_filter_min = GL_LINEAR_MIPMAP_LINEAR;
 int		gl_filter_mag = GL_LINEAR;
@@ -18,28 +28,37 @@ static mempool_t *texturemempool;
 
 // note: this must not conflict with TEXF_ flags in r_textures.h
 // cleared when a texture is uploaded
-#define GLTEXF_UPLOAD 0x00010000
+#define GLTEXF_UPLOAD		0x00010000
 // bitmask for mismatch checking
 #define GLTEXF_IMPORTANTBITS (0)
 // set when image is uploaded and freed
-#define GLTEXF_DESTROYED 0x00040000
+#define GLTEXF_DESTROYED	0x00040000
+// dynamic texture (treat texnum == 0 differently)
+#define GLTEXF_DYNAMIC		0x00080000
 
 typedef struct textypeinfo_s
 {
-	int textype;
+	textype_t textype;
 	int inputbytesperpixel;
 	int internalbytesperpixel;
+	float glinternalbytesperpixel;
 	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};
-static textypeinfo_t textype_dsdt          = {TEXTYPE_DSDT   , 2, 2, GL_DSDT_NV, GL_DSDT8_NV};
+static textypeinfo_t textype_palette                = {TEXTYPE_PALETTE, 1, 4, 4.0f, GL_BGRA   , 3};
+static textypeinfo_t textype_palette_alpha          = {TEXTYPE_PALETTE, 1, 4, 4.0f, GL_BGRA   , 4};
+static textypeinfo_t textype_palette_compress       = {TEXTYPE_PALETTE, 1, 4, 0.5f, GL_BGRA   , GL_COMPRESSED_RGB_ARB};
+static textypeinfo_t textype_palette_alpha_compress = {TEXTYPE_PALETTE, 1, 4, 1.0f, GL_BGRA   , GL_COMPRESSED_RGBA_ARB};
+static textypeinfo_t textype_rgba                   = {TEXTYPE_RGBA   , 4, 4, 4.0f, GL_RGBA   , 3};
+static textypeinfo_t textype_rgba_alpha             = {TEXTYPE_RGBA   , 4, 4, 4.0f, GL_RGBA   , 4};
+static textypeinfo_t textype_rgba_compress          = {TEXTYPE_RGBA   , 4, 4, 0.5f, GL_RGBA   , GL_COMPRESSED_RGB_ARB};
+static textypeinfo_t textype_rgba_alpha_compress    = {TEXTYPE_RGBA   , 4, 4, 1.0f, GL_RGBA   , GL_COMPRESSED_RGBA_ARB};
+static textypeinfo_t textype_bgra                   = {TEXTYPE_BGRA   , 4, 4, 4.0f, GL_BGRA   , 3};
+static textypeinfo_t textype_bgra_alpha             = {TEXTYPE_BGRA   , 4, 4, 4.0f, GL_BGRA   , 4};
+static textypeinfo_t textype_bgra_compress          = {TEXTYPE_BGRA   , 4, 4, 0.5f, GL_BGRA   , GL_COMPRESSED_RGB_ARB};
+static textypeinfo_t textype_bgra_alpha_compress    = {TEXTYPE_BGRA   , 4, 4, 1.0f, GL_BGRA   , GL_COMPRESSED_RGBA_ARB};
 
 #define GLTEXTURETYPE_1D 0
 #define GLTEXTURETYPE_2D 1
@@ -65,12 +84,19 @@ typedef struct gltexture_s
 	// (must be identical in rtexture_t)
 	int texnum; // GL texture slot number
 
+	// dynamic texture stuff [11/22/2007 Black]
+	// used to hold the texture number of dirty textures   
+	int dirtytexnum;
+	updatecallback_t updatecallback;
+	void *updatacallback_data;
+	// --- [11/22/2007 Black]
+
 	// 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;
 	// name of the texture (this might be removed someday), no duplicates
-	char identifier[32];
+	char identifier[MAX_QPATH + 32];
 	// original data size in *inputtexels
 	int inputwidth, inputheight, inputdepth;
 	// copy of the original texture(s) supplied to the upload function, for
@@ -87,7 +113,8 @@ typedef struct gltexture_s
 	int texturetype;
 	// palette if the texture is TEXTYPE_PALETTE
 	const unsigned int *palette;
-	// power of 2 size, after gl_picmip and gl_max_size are applied
+	// actual stored texture size after gl_picmip and gl_max_size are applied
+	// (power of 2 if gl_support_arb_texture_non_power_of_two is not supported)
 	int tilewidth, tileheight, tiledepth;
 	// 1 or 6 depending on texturetype
 	int sides;
@@ -114,44 +141,115 @@ static gltexturepool_t *gltexturepoolchain = NULL;
 
 static unsigned char *resizebuffer = NULL, *colorconvertbuffer;
 static int resizebuffersize = 0;
-static unsigned char *texturebuffer;
+static const unsigned char *texturebuffer;
 static int texturebuffersize = 0;
 
-static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
+static textypeinfo_t *R_GetTexTypeInfo(textype_t textype, int flags)
 {
-	if (flags & TEXF_ALPHA)
+	if ((flags & TEXF_COMPRESS) && gl_texturecompression.integer >= 1 && gl_support_texture_compression)
 	{
-		switch(textype)
+		if (flags & TEXF_ALPHA)
 		{
-		case TEXTYPE_PALETTE:
-			return &textype_palette_alpha;
-		case TEXTYPE_RGB:
-			Host_Error("R_GetTexTypeInfo: RGB format has no alpha, TEXF_ALPHA not allowed");
-			return NULL;
-		case TEXTYPE_RGBA:
-			return &textype_rgba_alpha;
-		default:
-			Host_Error("R_GetTexTypeInfo: unknown texture format");
-			return NULL;
+			switch(textype)
+			{
+			case TEXTYPE_PALETTE:
+				return &textype_palette_alpha_compress;
+			case TEXTYPE_RGBA:
+				return &textype_rgba_alpha_compress;
+			case TEXTYPE_BGRA:
+				return &textype_bgra_alpha_compress;
+			default:
+				Host_Error("R_GetTexTypeInfo: unknown texture format");
+				return NULL;
+			}
+		}
+		else
+		{
+			switch(textype)
+			{
+			case TEXTYPE_PALETTE:
+				return &textype_palette_compress;
+			case TEXTYPE_RGBA:
+				return &textype_rgba_compress;
+			case TEXTYPE_BGRA:
+				return &textype_bgra_compress;
+			default:
+				Host_Error("R_GetTexTypeInfo: unknown texture format");
+				return NULL;
+			}
 		}
 	}
 	else
 	{
-		switch(textype)
+		if (flags & TEXF_ALPHA)
 		{
-		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");
-			return NULL;
+			switch(textype)
+			{
+			case TEXTYPE_PALETTE:
+				return &textype_palette_alpha;
+			case TEXTYPE_RGBA:
+				return &textype_rgba_alpha;
+			case TEXTYPE_BGRA:
+				return &textype_bgra_alpha;
+			default:
+				Host_Error("R_GetTexTypeInfo: unknown texture format");
+				return NULL;
+			}
+		}
+		else
+		{
+			switch(textype)
+			{
+			case TEXTYPE_PALETTE:
+				return &textype_palette;
+			case TEXTYPE_RGBA:
+				return &textype_rgba;
+			case TEXTYPE_BGRA:
+				return &textype_bgra;
+			default:
+				Host_Error("R_GetTexTypeInfo: unknown texture format");
+				return NULL;
+			}
 		}
 	}
+	return NULL; // this line only to hush compiler warnings
+}
+
+// dynamic texture code [11/22/2007 Black]
+void R_MarkDirtyTexture(rtexture_t *rt) {
+	gltexture_t *glt = (gltexture_t*) rt;
+	if( !glt ) {
+		return;
+	}
+
+	// dont do anything if the texture is already dirty (and make sure this *is* a dynamic texture after all!)
+	if( !glt->dirtytexnum && glt->flags & GLTEXF_DYNAMIC ) {
+		glt->dirtytexnum = glt->texnum;
+		// mark it as dirty, so R_RealGetTexture gets called
+		glt->texnum = 0;
+	}
+}
+
+void R_MakeTextureDynamic(rtexture_t *rt, updatecallback_t updatecallback, void *data) {
+	gltexture_t *glt = (gltexture_t*) rt;
+	if( !glt ) {
+		return;
+	}
+
+	glt->flags |= GLTEXF_DYNAMIC;
+	glt->updatecallback = updatecallback;
+	glt->updatacallback_data = data;
+	glt->dirtytexnum = 0;
+}
+
+static void R_UpdateDynamicTexture(gltexture_t *glt) {
+	glt->texnum = glt->dirtytexnum;
+	// reset dirtytexnum again (not dirty anymore)
+	glt->dirtytexnum = 0;
+	// TODO: now assert that t->texnum != 0 ?
+	if( glt->updatecallback ) {
+		glt->updatecallback( (rtexture_t*) glt, glt->updatacallback_data );
+	}
 }
 
 static void R_UploadTexture(gltexture_t *t);
@@ -178,14 +276,24 @@ int R_RealGetTexture(rtexture_t *rt)
 	{
 		gltexture_t *glt;
 		glt = (gltexture_t *)rt;
+		if (glt->flags & GLTEXF_DYNAMIC)
+			R_UpdateDynamicTexture(glt);
 		if (glt->flags & GLTEXF_UPLOAD)
 			R_UploadTexture(glt);
+
 		return glt->texnum;
 	}
 	else
 		return 0;
 }
 
+void R_PurgeTexture(rtexture_t *rt)
+{
+	if(rt && !(((gltexture_t*) rt)->flags & TEXF_PERSISTENT)) {
+		R_FreeTexture(rt);
+	}
+}
+
 void R_FreeTexture(rtexture_t *rt)
 {
 	gltexture_t *glt, **gltpointer;
@@ -200,8 +308,11 @@ void R_FreeTexture(rtexture_t *rt)
 	else
 		Host_Error("R_FreeTexture: texture \"%s\" not linked in pool", glt->identifier);
 
-	if (glt->texnum)
-		qglDeleteTextures(1, (GLuint *)&glt->texnum);
+	if (!(glt->flags & GLTEXF_UPLOAD))
+	{
+		CHECKGLERROR
+		qglDeleteTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR
+	}
 
 	if (glt->inputtexels)
 		Mem_Free(glt->inputtexels);
@@ -296,6 +407,7 @@ static void GL_TextureMode_f (void)
 
 	// change all the existing mipmap texture objects
 	// FIXME: force renderer(/client/something?) restart instead?
+	CHECKGLERROR
 	for (pool = gltexturepoolchain;pool;pool = pool->next)
 	{
 		for (glt = pool->gltchain;glt;glt = glt->chain)
@@ -303,14 +415,18 @@ static void GL_TextureMode_f (void)
 			// only update already uploaded images
 			if (!(glt->flags & (GLTEXF_UPLOAD | TEXF_FORCENEAREST | TEXF_FORCELINEAR)))
 			{
-				qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);
-				qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);
+				qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);CHECKGLERROR
+				qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
 				if (glt->flags & TEXF_MIPMAP)
-					qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_min);
+				{
+					qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_min);CHECKGLERROR
+				}
 				else
-					qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_mag);
-				qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MAG_FILTER, gl_filter_mag);
-				qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);
+				{
+					qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_mag);CHECKGLERROR
+				}
+				qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MAG_FILTER, gl_filter_mag);CHECKGLERROR
+				qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
 			}
 		}
 	}
@@ -346,20 +462,35 @@ static void GL_Texture_CalcImageSize(int texturetype, int flags, int inwidth, in
 
 	if (outwidth)
 	{
-		for (width2 = 1;width2 < inwidth;width2 <<= 1);
-		for (width2 >>= picmip;width2 > maxsize;width2 >>= 1);
+		if (gl_support_arb_texture_non_power_of_two)
+			width2 = min(inwidth >> picmip, maxsize);
+		else
+		{
+			for (width2 = 1;width2 < inwidth;width2 <<= 1);
+			for (width2 >>= picmip;width2 > maxsize;width2 >>= 1);
+		}
 		*outwidth = max(1, width2);
 	}
 	if (outheight)
 	{
-		for (height2 = 1;height2 < inheight;height2 <<= 1);
-		for (height2 >>= picmip;height2 > maxsize;height2 >>= 1);
+		if (gl_support_arb_texture_non_power_of_two)
+			height2 = min(inheight >> picmip, maxsize);
+		else
+		{
+			for (height2 = 1;height2 < inheight;height2 <<= 1);
+			for (height2 >>= picmip;height2 > maxsize;height2 >>= 1);
+		}
 		*outheight = max(1, height2);
 	}
 	if (outdepth)
 	{
-		for (depth2 = 1;depth2 < indepth;depth2 <<= 1);
-		for (depth2 >>= picmip;depth2 > maxsize;depth2 >>= 1);
+		if (gl_support_arb_texture_non_power_of_two)
+			depth2 = min(indepth >> picmip, maxsize);
+		else
+		{
+			for (depth2 = 1;depth2 < indepth;depth2 <<= 1);
+			for (depth2 >>= picmip;depth2 > maxsize;depth2 >>= 1);
+		}
 		*outdepth = max(1, depth2);
 	}
 }
@@ -387,7 +518,7 @@ static int R_CalcTexelDataSize (gltexture_t *glt)
 		}
 	}
 
-	return size * glt->textype->internalbytesperpixel * glt->sides;
+	return (int)(size * glt->textype->glinternalbytesperpixel) * glt->sides;
 }
 
 void R_TextureStats_Print(qboolean printeach, qboolean printpool, qboolean printtotal)
@@ -445,8 +576,9 @@ static void R_TextureStats_f(void)
 static void r_textures_start(void)
 {
 	// LordHavoc: allow any alignment
-	qglPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 	CHECKGLERROR
+	qglPixelStorei(GL_UNPACK_ALIGNMENT, 1);CHECKGLERROR
+	qglPixelStorei(GL_PACK_ALIGNMENT, 1);CHECKGLERROR
 
 	texturemempool = Mem_AllocPool("texture management", 0, NULL);
 
@@ -490,6 +622,16 @@ void R_Textures_Init (void)
 	Cvar_RegisterVariable (&r_lerpimages);
 	Cvar_RegisterVariable (&r_precachetextures);
 	Cvar_RegisterVariable (&gl_texture_anisotropy);
+	Cvar_RegisterVariable (&gl_texturecompression);
+	Cvar_RegisterVariable (&gl_texturecompression_color);
+	Cvar_RegisterVariable (&gl_texturecompression_normal);
+	Cvar_RegisterVariable (&gl_texturecompression_gloss);
+	Cvar_RegisterVariable (&gl_texturecompression_glow);
+	Cvar_RegisterVariable (&gl_texturecompression_2d);
+	Cvar_RegisterVariable (&gl_texturecompression_q3bsplightmaps);
+	Cvar_RegisterVariable (&gl_texturecompression_q3bspdeluxemaps);
+	Cvar_RegisterVariable (&gl_texturecompression_sky);
+	Cvar_RegisterVariable (&gl_texturecompression_lightcubemaps);
 
 	R_RegisterModule("R_Textures", r_textures_start, r_textures_shutdown, r_textures_newmap);
 }
@@ -524,6 +666,7 @@ void R_Textures_Frame (void)
 
 		Cvar_SetValueQuick(&gl_texture_anisotropy, old_aniso);
 
+		CHECKGLERROR
 		for (pool = gltexturepoolchain;pool;pool = pool->next)
 		{
 			for (glt = pool->gltchain;glt;glt = glt->chain)
@@ -531,12 +674,12 @@ void R_Textures_Frame (void)
 				// only update already uploaded images
 				if ((glt->flags & (GLTEXF_UPLOAD | TEXF_MIPMAP)) == TEXF_MIPMAP)
 				{
-					qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);
+					qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);CHECKGLERROR
 
-					qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);
+					qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
 					qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MAX_ANISOTROPY_EXT, old_aniso);CHECKGLERROR
 
-					qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);
+					qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
 				}
 			}
 		}
@@ -628,20 +771,34 @@ static void GL_SetupTextureParameters(int flags, int texturetype)
 	CHECKGLERROR
 }
 
-static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy, int fragz, int fragwidth, int fragheight, int fragdepth)
+static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int fragy, int fragz, int fragwidth, int fragheight, int fragdepth)
 {
 	int i, mip, width, height, depth;
 	GLint oldbindtexnum;
-	unsigned char *prevbuffer;
+	const unsigned char *prevbuffer;
 	prevbuffer = data;
 
 	CHECKGLERROR
 
 	// we need to restore the texture binding after finishing the upload
-	qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);
-	qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);
-	CHECKGLERROR
+	qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);CHECKGLERROR
+	qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
 
+	// these are rounded up versions of the size to do better resampling
+	if (gl_support_arb_texture_non_power_of_two)
+	{
+		width = glt->inputwidth;
+		height = glt->inputheight;
+		depth = glt->inputdepth;
+	}
+	else
+	{
+		for (width  = 1;width  < glt->inputwidth ;width  <<= 1);
+		for (height = 1;height < glt->inputheight;height <<= 1);
+		for (depth  = 1;depth  < glt->inputdepth ;depth  <<= 1);
+	}
+
+	R_MakeResizeBufferBigger(width * height * depth * glt->sides * glt->bytesperpixel);
 	R_MakeResizeBufferBigger(fragwidth * fragheight * fragdepth * glt->sides * glt->bytesperpixel);
 
 	if (prevbuffer == NULL)
@@ -651,35 +808,24 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy
 	}
 	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, fragwidth * fragheight * fragdepth * glt->sides, glt->palette);
+		// promote paletted to BGRA, so we only have to worry about BGRA in the rest of this code
+		Image_Copy8bitBGRA(prevbuffer, colorconvertbuffer, fragwidth * fragheight * fragdepth * glt->sides, glt->palette);
 		prevbuffer = colorconvertbuffer;
 	}
 
-	// these are rounded up versions of the size to do better resampling
-	for (width  = 1;width  < glt->inputwidth ;width  <<= 1);
-	for (height = 1;height < glt->inputheight;height <<= 1);
-	for (depth  = 1;depth  < glt->inputdepth ;depth  <<= 1);
-
-	R_MakeResizeBufferBigger(width * height * depth * glt->sides * glt->bytesperpixel);
-
-	if ((glt->flags & (TEXF_MIPMAP | TEXF_PICMIP | GLTEXF_UPLOAD)) == 0)
+	if ((glt->flags & (TEXF_MIPMAP | TEXF_PICMIP | GLTEXF_UPLOAD)) == 0 && glt->inputwidth == glt->tilewidth && glt->inputheight == glt->tileheight && glt->inputdepth == glt->tiledepth)
 	{
 		// update a portion of the image
 		switch(glt->texturetype)
 		{
 		case GLTEXTURETYPE_1D:
-			qglTexSubImage1D(GL_TEXTURE_1D, 0, fragx, fragwidth, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-			CHECKGLERROR
+			qglTexSubImage1D(GL_TEXTURE_1D, 0, fragx, fragwidth, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR
 			break;
 		case GLTEXTURETYPE_2D:
-			qglTexSubImage2D(GL_TEXTURE_2D, 0, fragx, fragy, fragwidth, fragheight, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-			CHECKGLERROR
+			qglTexSubImage2D(GL_TEXTURE_2D, 0, fragx, fragy, fragwidth, fragheight, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR
 			break;
 		case GLTEXTURETYPE_3D:
-			qglTexSubImage3D(GL_TEXTURE_3D, 0, fragx, fragy, fragz, fragwidth, fragheight, fragdepth, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-			CHECKGLERROR
+			qglTexSubImage3D(GL_TEXTURE_3D, 0, fragx, fragy, fragz, fragwidth, fragheight, fragdepth, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR
 			break;
 		default:
 			Host_Error("R_Upload: partial update of type other than 1D, 2D, or 3D");
@@ -699,91 +845,91 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy
 		{
 			if (glt->inputwidth != width || glt->inputheight != height || glt->inputdepth != depth)
 			{
-				Image_Resample(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, glt->bytesperpixel, r_lerpimages.integer);
+				Image_Resample32(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, r_lerpimages.integer);
 				prevbuffer = resizebuffer;
 			}
 			// picmip/max_size
 			while (width > glt->tilewidth || height > glt->tileheight || depth > glt->tiledepth)
 			{
-				Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth, glt->bytesperpixel);
+				Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth);
 				prevbuffer = resizebuffer;
 			}
 		}
 		mip = 0;
+		if (gl_support_texture_compression)
+		{
+			if (gl_texturecompression.integer >= 2)
+				qglHint(GL_TEXTURE_COMPRESSION_HINT_ARB, GL_NICEST);
+			else
+				qglHint(GL_TEXTURE_COMPRESSION_HINT_ARB, GL_FASTEST);
+			CHECKGLERROR
+		}
 		switch(glt->texturetype)
 		{
 		case GLTEXTURETYPE_1D:
-			qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-			CHECKGLERROR
+			qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->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->bytesperpixel);
+					Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
 					prevbuffer = resizebuffer;
-					qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-					CHECKGLERROR
+					qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR
 				}
 			}
 			break;
 		case GLTEXTURETYPE_2D:
-			qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-			CHECKGLERROR
+			qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->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->bytesperpixel);
+					Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
 					prevbuffer = resizebuffer;
-					qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-					CHECKGLERROR
+					qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR
 				}
 			}
 			break;
 		case GLTEXTURETYPE_3D:
-			qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-			CHECKGLERROR
+			qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->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->bytesperpixel);
+					Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
 					prevbuffer = resizebuffer;
-					qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-					CHECKGLERROR
+					qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->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;
+			texturebuffer = (unsigned char *)prevbuffer;
 			for (i = 0;i < 6;i++)
 			{
 				prevbuffer = texturebuffer;
 				texturebuffer += glt->inputwidth * glt->inputheight * glt->inputdepth * glt->textype->inputbytesperpixel;
 				if (glt->inputwidth != width || glt->inputheight != height || glt->inputdepth != depth)
 				{
-					Image_Resample(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, glt->bytesperpixel, r_lerpimages.integer);
+					Image_Resample32(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, r_lerpimages.integer);
 					prevbuffer = resizebuffer;
 				}
 				// picmip/max_size
 				while (width > glt->tilewidth || height > glt->tileheight || depth > glt->tiledepth)
 				{
-					Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth, glt->bytesperpixel);
+					Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth);
 					prevbuffer = resizebuffer;
 				}
 				mip = 0;
-				qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-				CHECKGLERROR
+				qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->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->bytesperpixel);
+						Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
 						prevbuffer = resizebuffer;
-						qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-						CHECKGLERROR
+						qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);CHECKGLERROR
 					}
 				}
 			}
@@ -791,7 +937,7 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy
 		}
 		GL_SetupTextureParameters(glt->flags, glt->texturetype);
 	}
-	qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);
+	qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
 }
 
 static void R_UploadTexture (gltexture_t *glt)
@@ -799,7 +945,8 @@ static void R_UploadTexture (gltexture_t *glt)
 	if (!(glt->flags & GLTEXF_UPLOAD))
 		return;
 
-	qglGenTextures(1, (GLuint *)&glt->texnum);
+	CHECKGLERROR
+	qglGenTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR
 	R_Upload(glt, glt->inputtexels, 0, 0, 0, glt->inputwidth, glt->inputheight, glt->inputdepth);
 	if (glt->inputtexels)
 	{
@@ -811,7 +958,7 @@ static void R_UploadTexture (gltexture_t *glt)
 		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 unsigned char *data, const unsigned int *palette)
+static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, int sides, int flags, textype_t textype, int texturetype, const unsigned char *data, const unsigned int *palette)
 {
 	int i, size;
 	gltexture_t *glt;
@@ -836,7 +983,7 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 	size = width * height * depth * sides * texinfo->inputbytesperpixel;
 	if (size < 1)
 	{
-		Con_Printf ("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides);
+		Con_Printf ("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides, size);
 		return NULL;
 	}
 
@@ -860,11 +1007,8 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 			}
 		}
 		break;
-	case TEXTYPE_RGB:
-		if (flags & TEXF_ALPHA)
-			Host_Error("R_LoadTexture: RGB has no alpha, don't specify TEXF_ALPHA");
-		break;
 	case TEXTYPE_RGBA:
+	case TEXTYPE_BGRA:
 		if (flags & TEXF_ALPHA)
 		{
 			flags &= ~TEXF_ALPHA;
@@ -881,8 +1025,6 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 			}
 		}
 		break;
-	case TEXTYPE_DSDT:
-		break;
 	default:
 		Host_Error("R_LoadTexture: unknown texture type");
 	}
@@ -905,7 +1047,11 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 	glt->glformat = texinfo->glformat;
 	glt->bytesperpixel = texinfo->internalbytesperpixel;
 	glt->sides = glt->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
-	glt->texnum = -1;
+	glt->texnum = 0;
+	// init the dynamic texture attributes, too [11/22/2007 Black]
+	glt->dirtytexnum = 0;
+	glt->updatecallback = NULL;
+	glt->updatacallback_data = NULL;
 
 	if (data)
 	{
@@ -918,25 +1064,28 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 	GL_Texture_CalcImageSize(glt->texturetype, glt->flags, glt->inputwidth, glt->inputheight, glt->inputdepth, &glt->tilewidth, &glt->tileheight, &glt->tiledepth);
 	R_PrecacheTexture(glt);
 
+	// texture converting and uploading can take a while, so make sure we're sending keepalives
+	CL_KeepaliveMessage(false);
+
 	return (rtexture_t *)glt;
 }
 
-rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, int textype, int flags, const unsigned int *palette)
+rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, textype_t 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 unsigned char *data, int textype, int flags, const unsigned int *palette)
+rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const unsigned char *data, textype_t 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 unsigned char *data, int textype, int flags, const unsigned int *palette)
+rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const unsigned char *data, textype_t 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 unsigned char *data, int textype, int flags, const unsigned int *palette)
+rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette)
 {
 	return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, flags, textype, GLTEXTURETYPE_CUBEMAP, data, palette);
 }
@@ -956,7 +1105,7 @@ int R_TextureHeight(rtexture_t *rt)
 	return rt ? ((gltexture_t *)rt)->inputheight : 0;
 }
 
-void R_UpdateTexture(rtexture_t *rt, unsigned char *data, int x, int y, int width, int height)
+void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, int width, int height)
 {
 	gltexture_t *glt;
 	if (rt == NULL)
@@ -973,3 +1122,9 @@ void R_UpdateTexture(rtexture_t *rt, unsigned char *data, int x, int y, int widt
 	R_Upload(glt, data, x, y, 0, width, height, 1);
 }
 
+void R_ClearTexture (rtexture_t *rt)
+{
+	gltexture_t *glt = (gltexture_t *)rt;
+
+	R_Upload( glt, NULL, 0, 0, 0, glt->tilewidth, glt->tileheight, glt->tiledepth );
+}