From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 1 Apr 2011 01:03:30 +0000 (+0000)
Subject: upload NULL textures as NULL textures, rather than creating a big array
X-Git-Tag: xonotic-v0.6.0~163^2~554
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=34ea921bb524d9347e24d7f019520166c0c78fbb;p=xonotic%2Fdarkplaces.git

upload NULL textures as NULL textures, rather than creating a big array
of zeros to upload


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10992 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_textures.c b/gl_textures.c
index 733e8d30..d7729d55 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -1150,42 +1150,43 @@ static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data)
 		width = glt->tilewidth;
 		height = glt->tileheight;
 		depth = glt->tiledepth;
-		memset(resizebuffer, 0, width * height * depth * glt->sides * glt->bytesperpixel);
-		prevbuffer = resizebuffer;
+//		memset(resizebuffer, 0, width * height * depth * glt->sides * glt->bytesperpixel);
+//		prevbuffer = resizebuffer;
 	}
-	else if (glt->textype->textype == TEXTYPE_PALETTE)
-	{
-		// promote paletted to BGRA, so we only have to worry about BGRA in the rest of this code
-		Image_Copy8bitBGRA(prevbuffer, colorconvertbuffer, glt->inputwidth * glt->inputheight * glt->inputdepth * glt->sides, glt->palette);
-		prevbuffer = colorconvertbuffer;
-	}
-
-	if (glt->flags & TEXF_RGBMULTIPLYBYALPHA)
+	else
 	{
-		// multiply RGB channels by A channel before uploading
-		int alpha;
-		for (i = 0;i < glt->inputwidth*glt->inputheight*glt->inputdepth*4;i += 4)
+		if (glt->textype->textype == TEXTYPE_PALETTE)
 		{
-			alpha = prevbuffer[i+3];
-			colorconvertbuffer[i] = (prevbuffer[i] * alpha) >> 8;
-			colorconvertbuffer[i+1] = (prevbuffer[i+1] * alpha) >> 8;
-			colorconvertbuffer[i+2] = (prevbuffer[i+2] * alpha) >> 8;
-			colorconvertbuffer[i+3] = alpha;
+			// promote paletted to BGRA, so we only have to worry about BGRA in the rest of this code
+			Image_Copy8bitBGRA(prevbuffer, colorconvertbuffer, glt->inputwidth * glt->inputheight * glt->inputdepth * glt->sides, glt->palette);
+			prevbuffer = colorconvertbuffer;
+		}
+		if (glt->flags & TEXF_RGBMULTIPLYBYALPHA)
+		{
+			// multiply RGB channels by A channel before uploading
+			int alpha;
+			for (i = 0;i < glt->inputwidth*glt->inputheight*glt->inputdepth*4;i += 4)
+			{
+				alpha = prevbuffer[i+3];
+				colorconvertbuffer[i] = (prevbuffer[i] * alpha) >> 8;
+				colorconvertbuffer[i+1] = (prevbuffer[i+1] * alpha) >> 8;
+				colorconvertbuffer[i+2] = (prevbuffer[i+2] * alpha) >> 8;
+				colorconvertbuffer[i+3] = alpha;
+			}
+			prevbuffer = colorconvertbuffer;
+		}
+		// scale up to a power of 2 size (if appropriate)
+		if (glt->inputwidth != width || glt->inputheight != height || glt->inputdepth != depth)
+		{
+			Image_Resample32(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, r_lerpimages.integer);
+			prevbuffer = resizebuffer;
+		}
+		// apply mipmap reduction algorithm to get down to picmip/max_size
+		while (width > glt->tilewidth || height > glt->tileheight || depth > glt->tiledepth)
+		{
+			Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth);
+			prevbuffer = resizebuffer;
 		}
-		prevbuffer = colorconvertbuffer;
-	}
-
-	// scale up to a power of 2 size (if appropriate)
-	if (glt->inputwidth != width || glt->inputheight != height || glt->inputdepth != depth)
-	{
-		Image_Resample32(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, r_lerpimages.integer);
-		prevbuffer = resizebuffer;
-	}
-	// apply mipmap reduction algorithm to get down to picmip/max_size
-	while (width > glt->tilewidth || height > glt->tileheight || depth > glt->tiledepth)
-	{
-		Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth);
-		prevbuffer = resizebuffer;
 	}
 
 	// do the appropriate upload type...