X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=94d0461662ef03e405200b372f18b11f1ffcc836;hb=b19c27fd82074c42e1aba5b9d293f70f90995d02;hp=f26b44ade3bd90ff29d83817ae6cf905d806c3e5;hpb=83dcd0632d14eca27555ceddcbf39279c7a17f3f;p=xonotic%2Fdarkplaces.git

diff --git a/gl_textures.c b/gl_textures.c
index f26b44ad..94d04616 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -11,12 +11,12 @@ cvar_t r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1", "0 = never up
 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", "1", "whether to compress normalmap (normalmap) 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", "1", "whether to compress 2d (hud/menu) textures other than the font"};
-cvar_t gl_texturecompression_q3bsplightmaps = {CVAR_SAVE, "gl_texturecompression_q3bsplightmaps", "1", "whether to compress lightmaps in q3bsp format levels"};
-cvar_t gl_texturecompression_q3bspdeluxemaps = {CVAR_SAVE, "gl_texturecompression_q3bspdeluxemaps", "1", "whether to compress deluxemaps in q3bsp format levels (only levels compiled with q3map2 -deluxe have these)"};
+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)"};
 
@@ -28,42 +28,54 @@ 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;
+	int gltype;
 }
 textypeinfo_t;
 
-static textypeinfo_t textype_palette                = {TEXTYPE_PALETTE, 1, 4, 4.0f, GL_RGBA   , 3};
-static textypeinfo_t textype_rgb                    = {TEXTYPE_RGB    , 3, 3, 4.0f, GL_RGB    , 3};
-static textypeinfo_t textype_rgba                   = {TEXTYPE_RGBA   , 4, 4, 4.0f, GL_RGBA   , 3};
-static textypeinfo_t textype_palette_alpha          = {TEXTYPE_PALETTE, 1, 4, 4.0f, GL_RGBA   , 4};
-static textypeinfo_t textype_rgba_alpha             = {TEXTYPE_RGBA   , 4, 4, 4.0f, GL_RGBA   , 4};
-static textypeinfo_t textype_palette_compress       = {TEXTYPE_PALETTE, 1, 4, 0.5f, GL_RGBA   , GL_COMPRESSED_RGB_ARB};
-static textypeinfo_t textype_rgb_compress           = {TEXTYPE_RGB    , 3, 3, 0.5f, GL_RGB    , GL_COMPRESSED_RGB_ARB};
-static textypeinfo_t textype_rgba_compress          = {TEXTYPE_RGBA   , 4, 4, 0.5f, GL_RGBA   , GL_COMPRESSED_RGB_ARB};
-static textypeinfo_t textype_palette_alpha_compress = {TEXTYPE_PALETTE, 1, 4, 1.0f, GL_RGBA   , GL_COMPRESSED_RGBA_ARB};
-static textypeinfo_t textype_rgba_alpha_compress    = {TEXTYPE_RGBA   , 4, 4, 1.0f, GL_RGBA   , GL_COMPRESSED_RGBA_ARB};
-
-#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 textypeinfo_t textype_palette                = {TEXTYPE_PALETTE, 1, 4, 4.0f, GL_BGRA   , 3, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_palette_alpha          = {TEXTYPE_PALETTE, 1, 4, 4.0f, GL_BGRA   , 4, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_palette_compress       = {TEXTYPE_PALETTE, 1, 4, 0.5f, GL_BGRA   , GL_COMPRESSED_RGB_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_palette_alpha_compress = {TEXTYPE_PALETTE, 1, 4, 1.0f, GL_BGRA   , GL_COMPRESSED_RGBA_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_rgba                   = {TEXTYPE_RGBA   , 4, 4, 4.0f, GL_RGBA   , 3, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_rgba_alpha             = {TEXTYPE_RGBA   , 4, 4, 4.0f, GL_RGBA   , 4, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_rgba_compress          = {TEXTYPE_RGBA   , 4, 4, 0.5f, GL_RGBA   , GL_COMPRESSED_RGB_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_rgba_alpha_compress    = {TEXTYPE_RGBA   , 4, 4, 1.0f, GL_RGBA   , GL_COMPRESSED_RGBA_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_bgra                   = {TEXTYPE_BGRA   , 4, 4, 4.0f, GL_BGRA   , 3, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_bgra_alpha             = {TEXTYPE_BGRA   , 4, 4, 4.0f, GL_BGRA   , 4, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_bgra_compress          = {TEXTYPE_BGRA   , 4, 4, 0.5f, GL_BGRA   , GL_COMPRESSED_RGB_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_bgra_alpha_compress    = {TEXTYPE_BGRA   , 4, 4, 1.0f, GL_BGRA   , GL_COMPRESSED_RGBA_ARB, GL_UNSIGNED_BYTE};
+static textypeinfo_t textype_shadowmap16            = {TEXTYPE_SHADOWMAP,2,2, 2.0f, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT16_ARB, GL_UNSIGNED_SHORT};
+static textypeinfo_t textype_shadowmap24            = {TEXTYPE_SHADOWMAP,4,4, 4.0f, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT24_ARB, GL_UNSIGNED_INT};
+
+typedef enum gltexturetype_e
+{
+	GLTEXTURETYPE_2D,
+	GLTEXTURETYPE_3D,
+	GLTEXTURETYPE_CUBEMAP,
+	GLTEXTURETYPE_RECTANGLE,
+	GLTEXTURETYPE_TOTAL
+}
+gltexturetype_t;
+
+static int gltexturetypeenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_RECTANGLE_ARB};
+static int gltexturetypebindingenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_BINDING_2D, GL_TEXTURE_BINDING_3D, GL_TEXTURE_BINDING_CUBE_MAP_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB};
+static int gltexturetypedimensions[GLTEXTURETYPE_TOTAL] = {2, 3, 2, 2};
 static int cubemapside[6] =
 {
 	GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
@@ -80,6 +92,13 @@ 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
@@ -109,10 +128,12 @@ typedef struct gltexture_s
 	int sides;
 	// bytes per pixel
 	int bytesperpixel;
-	// GL_RGB or GL_RGBA
+	// GL_RGB or GL_RGBA or GL_DEPTH_COMPONENT
 	int glformat;
 	// 3 or 4
 	int glinternalformat;
+	// GL_UNSIGNED_BYTE or GL_UNSIGNED_INT or GL_UNSIGNED_SHORT or GL_FLOAT
+	int gltype;
 }
 gltexture_t;
 
@@ -130,10 +151,10 @@ 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_COMPRESS) && gl_texturecompression.integer >= 1 && gl_support_texture_compression)
 	{
@@ -143,11 +164,10 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
 			{
 			case TEXTYPE_PALETTE:
 				return &textype_palette_alpha_compress;
-			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_compress;
+			case TEXTYPE_BGRA:
+				return &textype_bgra_alpha_compress;
 			default:
 				Host_Error("R_GetTexTypeInfo: unknown texture format");
 				return NULL;
@@ -159,10 +179,10 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
 			{
 			case TEXTYPE_PALETTE:
 				return &textype_palette_compress;
-			case TEXTYPE_RGB:
-				return &textype_rgb_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;
@@ -177,11 +197,10 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
 			{
 			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;
+			case TEXTYPE_BGRA:
+				return &textype_bgra_alpha;
 			default:
 				Host_Error("R_GetTexTypeInfo: unknown texture format");
 				return NULL;
@@ -193,10 +212,12 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
 			{
 			case TEXTYPE_PALETTE:
 				return &textype_palette;
-			case TEXTYPE_RGB:
-				return &textype_rgb;
 			case TEXTYPE_RGBA:
 				return &textype_rgba;
+			case TEXTYPE_BGRA:
+				return &textype_bgra;
+			case TEXTYPE_SHADOWMAP:
+				return (flags & TEXF_LOWPRECISION) ? &textype_shadowmap16 : &textype_shadowmap24;
 			default:
 				Host_Error("R_GetTexTypeInfo: unknown texture format");
 				return NULL;
@@ -206,36 +227,48 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
 	return NULL; // this line only to hush compiler warnings
 }
 
-static void R_UploadTexture(gltexture_t *t);
+// dynamic texture code [11/22/2007 Black]
+void R_MarkDirtyTexture(rtexture_t *rt) {
+	gltexture_t *glt = (gltexture_t*) rt;
+	if( !glt ) {
+		return;
+	}
 
-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;
+	// 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;
+	}
+}
 
-	if (precache)
-		R_UploadTexture(glt);
+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;
 }
 
-int R_RealGetTexture(rtexture_t *rt)
+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 );
+	}
+}
+
+void R_PurgeTexture(rtexture_t *rt)
 {
-	if (rt)
-	{
-		gltexture_t *glt;
-		glt = (gltexture_t *)rt;
-		if (glt->flags & GLTEXF_UPLOAD)
-			R_UploadTexture(glt);
-		return glt->texnum;
+	if(rt && !(((gltexture_t*) rt)->flags & TEXF_PERSISTENT)) {
+		R_FreeTexture(rt);
 	}
-	else
-		return 0;
 }
 
 void R_FreeTexture(rtexture_t *rt)
@@ -252,7 +285,7 @@ void R_FreeTexture(rtexture_t *rt)
 	else
 		Host_Error("R_FreeTexture: texture \"%s\" not linked in pool", glt->identifier);
 
-	if (glt->texnum)
+	if (!(glt->flags & GLTEXF_UPLOAD))
 	{
 		CHECKGLERROR
 		qglDeleteTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR
@@ -386,7 +419,6 @@ static void GL_Texture_CalcImageSize(int texturetype, int flags, int inwidth, in
 	switch (texturetype)
 	{
 	default:
-	case GLTEXTURETYPE_1D:
 	case GLTEXTURETYPE_2D:
 		maxsize = gl_max_texture_size;
 		break;
@@ -500,7 +532,7 @@ void R_TextureStats_Print(qboolean printeach, qboolean printpool, qboolean print
 				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);
 		}
 		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);
+			Con_Printf("texturepool %10p total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", (void *)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;
@@ -646,7 +678,7 @@ void R_MakeResizeBufferBigger(int size)
 	}
 }
 
-static void GL_SetupTextureParameters(int flags, int texturetype)
+static void GL_SetupTextureParameters(int flags, textype_t textype, int texturetype)
 {
 	int textureenum = gltexturetypeenums[texturetype];
 	int wrapmode = ((flags & TEXF_CLAMP) && gl_support_clamptoedge) ? GL_CLAMP_TO_EDGE : GL_REPEAT;
@@ -712,14 +744,31 @@ static void GL_SetupTextureParameters(int flags, int texturetype)
 		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);CHECKGLERROR
 	}
 
+	if (textype == TEXTYPE_SHADOWMAP)
+	{
+		if (gl_support_arb_shadow)
+		{
+			if (flags & TEXF_COMPARE)
+			{
+				qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_MODE_ARB, GL_COMPARE_R_TO_TEXTURE_ARB);CHECKGLERROR
+			}
+			else
+			{
+				qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_MODE_ARB, GL_NONE);CHECKGLERROR
+			}
+			qglTexParameteri(textureenum, GL_TEXTURE_COMPARE_FUNC_ARB, GL_LEQUAL);CHECKGLERROR
+		}
+		qglTexParameteri(textureenum, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE);CHECKGLERROR
+	}
+
 	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
@@ -729,7 +778,7 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy
 	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)
+	if (gl_support_arb_texture_non_power_of_two || glt->texturetype == GLTEXTURETYPE_RECTANGLE)
 	{
 		width = glt->inputwidth;
 		height = glt->inputheight;
@@ -752,9 +801,8 @@ 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;
 	}
 
@@ -763,17 +811,14 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy
 		// 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
-			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, glt->gltype, 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, glt->gltype, prevbuffer);CHECKGLERROR
 			break;
 		default:
-			Host_Error("R_Upload: partial update of type other than 1D, 2D, or 3D");
+			Host_Error("R_Upload: partial update of type other than 2D");
 			break;
 		}
 	}
@@ -790,13 +835,13 @@ 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;
 			}
 		}
@@ -811,108 +856,116 @@ static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy
 		}
 		switch(glt->texturetype)
 		{
-		case GLTEXTURETYPE_1D:
-			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);
-					prevbuffer = resizebuffer;
-					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, glt->gltype, 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, glt->gltype, 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, glt->gltype, 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, glt->gltype, 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, glt->gltype, 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, glt->gltype, prevbuffer);CHECKGLERROR
 					}
 				}
 			}
 			break;
+		case GLTEXTURETYPE_RECTANGLE:
+			qglTexImage2D(GL_TEXTURE_RECTANGLE_ARB, mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, NULL);CHECKGLERROR
+			break;
 		}
-		GL_SetupTextureParameters(glt->flags, glt->texturetype);
+		GL_SetupTextureParameters(glt->flags, glt->textype->textype, glt->texturetype);
 	}
 	qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
 }
 
-static void R_UploadTexture (gltexture_t *glt)
+int R_RealGetTexture(rtexture_t *rt)
 {
-	if (!(glt->flags & GLTEXF_UPLOAD))
-		return;
-
-	CHECKGLERROR
-	qglGenTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR
-	R_Upload(glt, glt->inputtexels, 0, 0, 0, glt->inputwidth, glt->inputheight, glt->inputdepth);
-	if (glt->inputtexels)
+	if (rt)
 	{
-		Mem_Free(glt->inputtexels);
-		glt->inputtexels = NULL;
-		glt->flags |= GLTEXF_DESTROYED;
+		gltexture_t *glt;
+		glt = (gltexture_t *)rt;
+		if (glt->flags & GLTEXF_DYNAMIC)
+			R_UpdateDynamicTexture(glt);
+		if (glt->flags & GLTEXF_UPLOAD)
+		{
+			CHECKGLERROR
+			qglGenTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR
+			R_Upload(glt, glt->inputtexels, 0, 0, 0, glt->inputwidth, glt->inputheight, glt->inputdepth);
+			if (glt->inputtexels)
+			{
+				Mem_Free(glt->inputtexels);
+				glt->inputtexels = NULL;
+				glt->flags |= GLTEXF_DESTROYED;
+			}
+			else if (glt->flags & GLTEXF_DESTROYED)
+				Con_Printf("R_GetTexture: Texture %s already uploaded and destroyed.  Can not upload original image again.  Uploaded blank texture.\n", glt->identifier);
+		}
+
+		return glt->texnum;
 	}
-	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);
+	else
+		return 0;
 }
 
-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;
 	gltexturepool_t *pool = (gltexturepool_t *)rtexturepool;
 	textypeinfo_t *texinfo;
+	int precache;
 
 	if (cls.state == ca_dedicated)
 		return NULL;
 
+	if (texturetype == GLTEXTURETYPE_RECTANGLE && !gl_texturerectangle)
+	{
+		Con_Printf ("R_LoadTexture: rectangle texture not supported by driver\n");
+		return NULL;
+	}
 	if (texturetype == GLTEXTURETYPE_CUBEMAP && !gl_texturecubemap)
 	{
 		Con_Printf ("R_LoadTexture: cubemap texture not supported by driver\n");
@@ -952,11 +1005,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;
@@ -973,6 +1023,8 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 			}
 		}
 		break;
+	case TEXTYPE_SHADOWMAP:
+		break;
 	default:
 		Host_Error("R_LoadTexture: unknown texture type");
 	}
@@ -993,44 +1045,103 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 	glt->palette = palette;
 	glt->glinternalformat = texinfo->glinternalformat;
 	glt->glformat = texinfo->glformat;
+	glt->gltype = texinfo->gltype;
 	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;
+
+	GL_Texture_CalcImageSize(glt->texturetype, glt->flags, glt->inputwidth, glt->inputheight, glt->inputdepth, &glt->tilewidth, &glt->tileheight, &glt->tiledepth);
+
+	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 (data)
+	if (precache)
 	{
-		glt->inputtexels = (unsigned char *)Mem_Alloc(texturemempool, size);
-		memcpy(glt->inputtexels, data, size);
+		// immediate upload (most common case)
+		// data may be NULL (blank texture for dynamic rendering)
+		CHECKGLERROR
+		qglGenTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR
+		R_Upload(glt, data, 0, 0, 0, glt->inputwidth, glt->inputheight, glt->inputdepth);
+	}
+	else if (data)
+	{
+		// deferred texture upload (menu graphics)
+		// optimize first if possible
+		if ((textype == TEXTYPE_BGRA || textype == TEXTYPE_RGBA) && glt->inputwidth * glt->inputheight * glt->inputdepth > glt->tilewidth * glt->tileheight * glt->tiledepth)
+		{
+			glt->inputtexels = (unsigned char *)Mem_Alloc(texturemempool, glt->tilewidth*glt->tileheight*glt->tiledepth*glt->sides*glt->bytesperpixel);
+			Image_Resample32(data, glt->inputwidth, glt->inputheight, glt->inputdepth, glt->inputtexels, glt->tilewidth, glt->tileheight, glt->tiledepth, r_lerpimages.integer);
+			// change texture size accordingly
+			glt->inputwidth = glt->tilewidth;
+			glt->inputheight = glt->tileheight;
+			glt->inputdepth = glt->tiledepth;
+			GL_Texture_CalcImageSize(glt->texturetype, glt->flags, glt->inputwidth, glt->inputheight, glt->inputdepth, &glt->tilewidth, &glt->tileheight, &glt->tiledepth);
+		}
+		else
+		{
+			glt->inputtexels = (unsigned char *)Mem_Alloc(texturemempool, size);
+			memcpy(glt->inputtexels, data, size);
+		}
 	}
-	else
-		glt->inputtexels = NULL;
 
-	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)
-{
-	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);
 }
 
+static int R_ShadowMapTextureFlags(int precision, qboolean filter)
+{
+	int flags = TEXF_ALWAYSPRECACHE | TEXF_CLAMP;
+	if (filter)
+		flags |= TEXF_FORCELINEAR | TEXF_COMPARE;
+	else
+		flags |= TEXF_FORCENEAREST;
+	if (precision <= 16)
+		flags |= TEXF_LOWPRECISION;
+	return flags;
+}
+
+rtexture_t *R_LoadTextureShadowMapRectangle(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int precision, qboolean filter)
+{
+	return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, R_ShadowMapTextureFlags(precision, filter), TEXTYPE_SHADOWMAP, GLTEXTURETYPE_RECTANGLE, NULL, NULL);
+}
+
+rtexture_t *R_LoadTextureShadowMap2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int precision, qboolean filter)
+{
+	return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, R_ShadowMapTextureFlags(precision, filter), TEXTYPE_SHADOWMAP, GLTEXTURETYPE_2D, NULL, NULL);
+}
+
+rtexture_t *R_LoadTextureShadowMapCube(rtexturepool_t *rtexturepool, const char *identifier, int width, int precision, qboolean filter)
+{
+    return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, R_ShadowMapTextureFlags(precision, filter), TEXTYPE_SHADOWMAP, GLTEXTURETYPE_CUBEMAP, NULL, NULL);
+}
+
 int R_TextureHasAlpha(rtexture_t *rt)
 {
 	return rt ? (((gltexture_t *)rt)->flags & TEXF_ALPHA) != 0 : false;
@@ -1046,20 +1157,25 @@ 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)
 		Host_Error("R_UpdateTexture: no texture supplied");
 	if (data == NULL)
 		Host_Error("R_UpdateTexture: no data supplied");
-	glt = (gltexture_t *)rt;
 
 	// we need it to be uploaded before we can update a part of it
-	if (glt->flags & GLTEXF_UPLOAD)
-		R_UploadTexture(glt);
+	R_RealGetTexture(rt);
 
 	// update part of the texture
+	glt = (gltexture_t *)rt;
 	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 );
+}