X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=0c9147caa8a18ce46ef91e6c35fda56cd4526400;hb=a7588ff57ce6eaa55dc315ea04e8712746307f03;hp=cab9f636b450bd135bb4be3df5b18eda327d8ffb;hpb=57252d1b300d96b2353bf9d564b0de281552d2c5;p=xonotic%2Fdarkplaces.git

diff --git a/gl_textures.c b/gl_textures.c
index cab9f636..0c9147ca 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -3,11 +3,12 @@
 #include "image.h"
 #include "jpeg.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	gl_max_size = {CVAR_SAVE, "gl_max_size", "2048"};
+cvar_t	gl_max_scrapsize = {CVAR_SAVE, "gl_max_scrapsize", "256"};
+cvar_t	gl_picmip = {CVAR_SAVE, "gl_picmip", "0"};
 cvar_t	r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1"};
 cvar_t	r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1"};
+cvar_t  gl_texture_anisotropy = {CVAR_SAVE, "gl_texture_anisotropy", "1"};
 
 int		gl_filter_min = GL_LINEAR_MIPMAP_LINEAR;
 int		gl_filter_mag = GL_LINEAR;
@@ -38,11 +39,12 @@ typedef struct
 }
 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_palette       = {TEXTYPE_PALETTE, 1, 4, GL_RGBA   , 3};
+static textypeinfo_t textype_rgb           = {TEXTYPE_RGB    , 3, 3, GL_RGB    , 3};
+static textypeinfo_t textype_rgba          = {TEXTYPE_RGBA   , 4, 4, GL_RGBA   , 3};
+static textypeinfo_t textype_palette_alpha = {TEXTYPE_PALETTE, 1, 4, GL_RGBA   , 4};
+static textypeinfo_t textype_rgba_alpha    = {TEXTYPE_RGBA   , 4, 4, GL_RGBA   , 4};
+static textypeinfo_t textype_dsdt          = {TEXTYPE_DSDT   , 2, 2, GL_DSDT_NV, GL_DSDT8_NV};
 
 // a tiling texture (most common type)
 #define GLIMAGETYPE_TILE 0
@@ -55,6 +57,7 @@ static textypeinfo_t textype_rgba_alpha    = {TEXTYPE_RGBA   , 4, 4, GL_RGBA, 4}
 #define GLTEXTURETYPE_CUBEMAP 3
 
 static int gltexturetypeenums[4] = {GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_ARB};
+static int gltexturetypebindingenums[4] = {GL_TEXTURE_BINDING_1D, GL_TEXTURE_BINDING_2D, GL_TEXTURE_BINDING_3D, GL_TEXTURE_BINDING_CUBE_MAP_ARB};
 static int gltexturetypedimensions[4] = {1, 2, 3, 2};
 static int cubemapside[6] =
 {
@@ -165,6 +168,8 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
 			return &textype_rgb;
 		case TEXTYPE_RGBA:
 			return &textype_rgba;
+		case TEXTYPE_DSDT:
+			return &textype_dsdt;
 		default:
 			Host_Error("R_GetTexTypeInfo: unknown texture format\n");
 			return NULL;
@@ -320,11 +325,10 @@ static glmode_t modes[] =
 	{"GL_LINEAR_MIPMAP_LINEAR", GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR}
 };
 
-extern int gl_backend_rebindtextures;
-
 static void GL_TextureMode_f (void)
 {
 	int i;
+	GLint oldbindtexnum;
 	gltextureimage_t *image;
 	gltexturepool_t *pool;
 
@@ -334,11 +338,11 @@ static void GL_TextureMode_f (void)
 		{
 			if (gl_filter_min == modes[i].minification)
 			{
-				Con_Printf ("%s\n", modes[i].name);
+				Con_Printf("%s\n", modes[i].name);
 				return;
 			}
 		}
-		Con_Printf ("current filter is unknown???\n");
+		Con_Print("current filter is unknown???\n");
 		return;
 	}
 
@@ -347,7 +351,7 @@ static void GL_TextureMode_f (void)
 			break;
 	if (i == 6)
 	{
-		Con_Printf ("bad filter name\n");
+		Con_Print("bad filter name\n");
 		return;
 	}
 
@@ -361,36 +365,40 @@ static void GL_TextureMode_f (void)
 		for (image = pool->imagechain;image;image = image->imagechain)
 		{
 			// only update already uploaded images
-			if (!(image->flags & GLTEXF_UPLOAD))
+			if (!(image->flags & GLTEXF_UPLOAD) && !(image->flags & (TEXF_FORCENEAREST | TEXF_FORCELINEAR)))
 			{
-				qglBindTexture(GL_TEXTURE_2D, image->texnum);
+				qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
+				qglBindTexture(gltexturetypeenums[image->texturetype], image->texnum);
 				if (image->flags & TEXF_MIPMAP)
-					qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+					qglTexParameteri(gltexturetypeenums[image->texturetype], 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);
+					qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+				qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+				qglBindTexture(gltexturetypeenums[image->texturetype], oldbindtexnum);
 			}
 		}
 	}
-	gl_backend_rebindtextures = true;
 }
 
 static int R_CalcTexelDataSize (gltexture_t *glt)
 {
-	int width2, height2, depth2, size;
+	int width2, height2, depth2, size, picmip;
 	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);
+		picmip = 0;
+		if (glt->flags & TEXF_PICMIP)
+			picmip = gl_picmip.integer;
+		if (gl_max_size.integer > realmaxsize)
+			Cvar_SetValue("gl_max_size", realmaxsize);
 		// calculate final size
 		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);
+		for (width2 >>= picmip;width2 > gl_max_size.integer;width2 >>= 1);
+		for (height2 >>= picmip;height2 > gl_max_size.integer;height2 >>= 1);
+		for (depth2 >>= picmip;depth2 > gl_max_size.integer;depth2 >>= 1);
 		if (width2 < 1) width2 = 1;
 		if (height2 < 1) height2 = 1;
 		if (depth2 < 1) depth2 = 1;
@@ -447,7 +455,7 @@ static void R_TextureStats_f(void)
 	int loaded;
 	gltexture_t *glt;
 	gltexturepool_t *pool;
-	Con_Printf("glsize input loaded mip alpha name\n");
+	Con_Print("glsize input loaded mip alpha name\n");
 	for (pool = gltexturepoolchain;pool;pool = pool->next)
 	{
 		for (glt = pool->gltchain;glt;glt = glt->chain)
@@ -472,13 +480,15 @@ static void r_textures_start(void)
 	CHECKGLERROR
 
 	// use the largest scrap texture size we can (not sure if this is really a good idea)
-	for (block_size = 1;block_size < realmaxsize && block_size < r_max_scrapsize.integer;block_size <<= 1);
+	for (block_size = 1;block_size < realmaxsize && block_size < gl_max_scrapsize.integer;block_size <<= 1);
 
-	texturemempool = Mem_AllocPool("Texture Info");
-	texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)");
-	textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers");
+	texturemempool = Mem_AllocPool("Texture Info", 0, NULL);
+	texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)", 0, NULL);
+	textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers", 0, NULL);
 
-	JPEG_OpenLibrary ();
+	// Disable JPEG screenshots if the DLL isn't loaded
+	if (! JPEG_OpenLibrary ())
+		Cvar_SetValueQuick (&scr_screenshot_jpeg, 0);
 }
 
 static void r_textures_shutdown(void)
@@ -511,17 +521,20 @@ void R_Textures_Init (void)
 {
 	Cmd_AddCommand("gl_texturemode", &GL_TextureMode_f);
 	Cmd_AddCommand("r_texturestats", R_TextureStats_f);
-	Cvar_RegisterVariable (&r_max_scrapsize);
-	Cvar_RegisterVariable (&r_max_size);
-	Cvar_RegisterVariable (&r_picmip);
+	Cvar_RegisterVariable (&gl_max_scrapsize);
+	Cvar_RegisterVariable (&gl_max_size);
+	Cvar_RegisterVariable (&gl_picmip);
 	Cvar_RegisterVariable (&r_lerpimages);
 	Cvar_RegisterVariable (&r_precachetextures);
+	Cvar_RegisterVariable (&gl_texture_anisotropy);
 
 	R_RegisterModule("R_Textures", r_textures_start, r_textures_shutdown, r_textures_newmap);
 }
 
 void R_Textures_Frame (void)
 {
+	static int old_aniso = 0;
+
 	// could do procedural texture animation here, if we keep track of which
 	// textures were accessed this frame...
 
@@ -537,6 +550,34 @@ void R_Textures_Frame (void)
 		Mem_Free(colorconvertbuffer);
 		colorconvertbuffer = NULL;
 	}
+
+	if (old_aniso != gl_texture_anisotropy.integer)
+	{
+		gltextureimage_t *image;
+		gltexturepool_t *pool;
+		GLint oldbindtexnum;
+
+		old_aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
+		
+		Cvar_SetValueQuick(&gl_texture_anisotropy, old_aniso);
+
+		for (pool = gltexturepoolchain;pool;pool = pool->next)
+		{
+			for (image = pool->imagechain;image;image = image->imagechain)
+			{
+				// only update already uploaded images
+				if (!(image->flags & GLTEXF_UPLOAD))
+				{
+					qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
+
+					qglBindTexture(gltexturetypeenums[image->texturetype], image->texnum);
+					qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MAX_ANISOTROPY_EXT, old_aniso);CHECKGLERROR
+
+					qglBindTexture(gltexturetypeenums[image->texturetype], oldbindtexnum);
+				}
+			}
+		}
+	}
 }
 
 void R_MakeResizeBufferBigger(int size)
@@ -562,39 +603,63 @@ static void GL_SetupTextureParameters(int flags, int texturetype)
 
 	CHECKGLERROR
 
-	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode);
-	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode);
+	if (gl_support_anisotropy)
+	{
+		int aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
+		if (gl_texture_anisotropy.integer != aniso)
+			Cvar_SetValueQuick(&gl_texture_anisotropy, aniso);
+		qglTexParameteri(textureenum, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso);CHECKGLERROR
+	}
+	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode);CHECKGLERROR
+	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode);CHECKGLERROR
 	if (gltexturetypedimensions[texturetype] >= 3)
-		qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode);
+	{
+		qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode);CHECKGLERROR
+	}
 
+	CHECKGLERROR
 	if (flags & TEXF_FORCENEAREST)
 	{
 		if (flags & TEXF_MIPMAP)
-			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);CHECKGLERROR
+		}
 		else
-			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST);CHECKGLERROR
+		}
+		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_NEAREST);CHECKGLERROR
 	}
 	else if (flags & TEXF_FORCELINEAR)
 	{
 		if (flags & TEXF_MIPMAP)
 		{
 			if (gl_filter_min == GL_NEAREST_MIPMAP_LINEAR || gl_filter_min == GL_LINEAR_MIPMAP_LINEAR)
-				qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+			{
+				qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);CHECKGLERROR
+			}
 			else
-				qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+			{
+				qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);CHECKGLERROR
+			}
 		}
 		else
-			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR);CHECKGLERROR
+		}
+		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR);CHECKGLERROR
 	}
 	else
 	{
 		if (flags & TEXF_MIPMAP)
-			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min);CHECKGLERROR
+		}
 		else
-			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
-		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+		{
+			qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag);CHECKGLERROR
+		}
+		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);CHECKGLERROR
 	}
 
 	CHECKGLERROR
@@ -602,24 +667,26 @@ static void GL_SetupTextureParameters(int flags, int texturetype)
 
 static void R_Upload(gltexture_t *glt, qbyte *data)
 {
-	int i, mip, width, height, depth, internalformat;
+	int i, mip, width, height, depth;
+	GLint oldbindtexnum;
 	qbyte *prevbuffer;
 	prevbuffer = data;
 
 	CHECKGLERROR
 
 	glt->texnum = glt->image->texnum;
+	// we need to restore the texture binding after finishing the upload
+	qglGetIntegerv(gltexturetypebindingenums[glt->image->texturetype], &oldbindtexnum);
 	qglBindTexture(gltexturetypeenums[glt->image->texturetype], glt->image->texnum);
 	CHECKGLERROR
 	glt->flags &= ~GLTEXF_UPLOAD;
-	gl_backend_rebindtextures = true;
 
 	if (glt->flags & TEXF_FRAGMENT)
 	{
 		if (glt->image->flags & GLTEXF_UPLOAD)
 		{
 			glt->image->flags &= ~GLTEXF_UPLOAD;
-			Con_DPrintf("uploaded new fragments image\n");
+			Con_DPrint("uploaded new fragments image\n");
 			R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
 			memset(resizebuffer, 255, glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
 			switch(glt->image->texturetype)
@@ -676,124 +743,85 @@ static void R_Upload(gltexture_t *glt, qbyte *data)
 			Host_Error("R_Upload: fragment texture of type other than 1D, 2D, or 3D\n");
 			break;
 		}
-		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)
-		{
-			// 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;
-		}
-	}
+		glt->image->flags &= ~GLTEXF_UPLOAD;
 
-	// 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;
+		// 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);
 
-	// cubemaps contain multiple images and thus get processed a bit differently
-	if (glt->image->texturetype != GLTEXTURETYPE_CUBEMAP)
-	{
-		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)
+		R_MakeResizeBufferBigger(width * height * depth * glt->image->sides * glt->image->bytesperpixel);
+
+		if (prevbuffer == NULL)
 		{
-			Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel);
+			width = glt->image->width;
+			height = glt->image->height;
+			depth = glt->image->depth;
+			memset(resizebuffer, 255, width * height * 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)
+		else
 		{
-			while (width > 1 || height > 1 || depth > 1)
+			if (glt->textype->textype == TEXTYPE_PALETTE)
 			{
-				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
+				// 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;
 			}
 		}
-		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)
+
+		// cubemaps contain multiple images and thus get processed a bit differently
+		if (glt->image->texturetype != GLTEXTURETYPE_CUBEMAP)
 		{
-			while (width > 1 || height > 1 || depth > 1)
+			if (glt->width != width || glt->height != height || glt->depth != depth)
 			{
-				Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+				Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer);
 				prevbuffer = resizebuffer;
-				qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-				CHECKGLERROR
 			}
-		}
-		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)
+			// picmip/max_size
+			while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth)
 			{
-				Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+				Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel);
 				prevbuffer = resizebuffer;
-				qglTexImage3D(GL_TEXTURE_3D, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-				CHECKGLERROR
 			}
 		}
-		break;
-	case GLTEXTURETYPE_CUBEMAP:
-		// convert and upload each side in turn,
-		// from a continuous block of input texels
-		texturebuffer = prevbuffer;
-		for (i = 0;i < 6;i++)
+		mip = 0;
+		switch(glt->image->texturetype)
 		{
-			prevbuffer = texturebuffer;
-			texturebuffer += width * height * depth * glt->textype->inputbytesperpixel;
-			if (glt->width != width || glt->height != height || glt->depth != depth)
+		case GLTEXTURETYPE_1D:
+			qglTexImage1D(GL_TEXTURE_1D, mip++, glt->image->glinternalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+			CHECKGLERROR
+			if (glt->flags & TEXF_MIPMAP)
 			{
-				Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer);
-				prevbuffer = resizebuffer;
+				while (width > 1 || height > 1 || depth > 1)
+				{
+					Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+					prevbuffer = resizebuffer;
+					qglTexImage1D(GL_TEXTURE_1D, mip++, glt->image->glinternalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+					CHECKGLERROR
+				}
 			}
-			// picmip/max_size
-			while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth)
+			break;
+		case GLTEXTURETYPE_2D:
+			qglTexImage2D(GL_TEXTURE_2D, mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+			CHECKGLERROR
+			if (glt->flags & TEXF_MIPMAP)
 			{
-				Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel);
-				prevbuffer = resizebuffer;
+				while (width > 1 || height > 1 || depth > 1)
+				{
+					Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+					prevbuffer = resizebuffer;
+					qglTexImage2D(GL_TEXTURE_2D, mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+					CHECKGLERROR
+				}
 			}
-			mip = 0;
-			qglTexImage2D(cubemapside[i], mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+			break;
+		case GLTEXTURETYPE_3D:
+			qglTexImage3D(GL_TEXTURE_3D, mip++, glt->image->glinternalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
 			CHECKGLERROR
 			if (glt->flags & TEXF_MIPMAP)
 			{
@@ -801,19 +829,54 @@ static void R_Upload(gltexture_t *glt, qbyte *data)
 				{
 					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);
+					qglTexImage3D(GL_TEXTURE_3D, mip++, glt->image->glinternalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
 					CHECKGLERROR
 				}
 			}
+			break;
+		case GLTEXTURETYPE_CUBEMAP:
+			// convert and upload each side in turn,
+			// from a continuous block of input texels
+			texturebuffer = prevbuffer;
+			for (i = 0;i < 6;i++)
+			{
+				prevbuffer = texturebuffer;
+				texturebuffer += glt->width * glt->height * glt->depth * glt->textype->inputbytesperpixel;
+				if (glt->width != width || glt->height != height || glt->depth != depth)
+				{
+					Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer);
+					prevbuffer = resizebuffer;
+				}
+				// picmip/max_size
+				while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth)
+				{
+					Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel);
+					prevbuffer = resizebuffer;
+				}
+				mip = 0;
+				qglTexImage2D(cubemapside[i], mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+				CHECKGLERROR
+				if (glt->flags & TEXF_MIPMAP)
+				{
+					while (width > 1 || height > 1 || depth > 1)
+					{
+						Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+						prevbuffer = resizebuffer;
+						qglTexImage2D(cubemapside[i], mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+						CHECKGLERROR
+					}
+				}
+			}
+			break;
 		}
-		break;
+		GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype);
 	}
-	GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype);
+	qglBindTexture(gltexturetypeenums[glt->image->texturetype], oldbindtexnum);
 }
 
 static void R_FindImageForTexture(gltexture_t *glt)
 {
-	int i, j, best, best2, x, y, z, w, h, d;
+	int i, j, best, best2, x, y, z, w, h, d, picmip;
 	textypeinfo_t *texinfo;
 	gltexturepool_t *pool;
 	gltextureimage_t *image, **imagechainpointer;
@@ -908,15 +971,18 @@ static void R_FindImageForTexture(gltexture_t *glt)
 		image->type = GLIMAGETYPE_TILE;
 		image->blockallocation = NULL;
 
+		picmip = 0;
+		if (glt->flags & TEXF_PICMIP)
+			picmip = gl_picmip.integer;
 		// calculate final size
-		if (r_max_size.integer > realmaxsize)
-			Cvar_SetValue("r_max_size", realmaxsize);
+		if (gl_max_size.integer > realmaxsize)
+			Cvar_SetValue("gl_max_size", realmaxsize);
 		for (image->width = 1;image->width < glt->width;image->width <<= 1);
 		for (image->height = 1;image->height < glt->height;image->height <<= 1);
 		for (image->depth = 1;image->depth < glt->depth;image->depth <<= 1);
-		for (image->width >>= 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);
+		for (image->width >>= picmip;image->width > gl_max_size.integer;image->width >>= 1);
+		for (image->height >>= picmip;image->height > gl_max_size.integer;image->height >>= 1);
+		for (image->depth >>= picmip;image->depth > gl_max_size.integer;image->depth >>= 1);
 		if (image->width < 1) image->width = 1;
 		if (image->height < 1) image->height = 1;
 		if (image->depth < 1) image->depth = 1;
@@ -924,7 +990,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
 	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->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP)) | GLTEXF_UPLOAD;
 	image->bytesperpixel = texinfo->internalbytesperpixel;
 	image->sides = image->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
 	// get a texture number to use
@@ -1027,6 +1093,8 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 			}
 		}
 		break;
+	case TEXTYPE_DSDT:
+		break;
 	default:
 		Host_Error("R_LoadTexture: unknown texture type\n");
 	}