From: havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Date: Mon, 23 Aug 2010 15:09:37 +0000 (+0000)
Subject: UNMERGE
X-Git-Tag: xonotic-v0.1.0preview~197
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5dfbcc2210e56392beea54f5cedb4c8f53ac0151;p=xonotic%2Fdarkplaces.git

UNMERGE
split and overhauled R_Upload into two functions:
R_UploadPartialTexture - does a partial update for real, not used by
anything if gl_nopartialtextureupdates is on
R_UploadFullTexture - takes only new pixel data, does appropriate
scaling and uploads to video memory

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10416 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=7a98ba933dc5de54c8ae6556ac48c3ff067f33ee
---

diff --git a/gl_textures.c b/gl_textures.c
index c7ec81f9..d244f006 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -976,24 +976,12 @@ static void GL_SetupTextureParameters(int flags, textype_t textype, int texturet
 	CHECKGLERROR
 }
 
-static void R_UploadPartialTexture(gltexture_t *glt, const 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)
 {
-	if (data == NULL)
-		Sys_Error("R_UploadPartialTexture \"%s\": partial update with NULL pixels", glt->identifier);
-
-	if (glt->texturetype != GLTEXTURETYPE_2D)
-		Sys_Error("R_UploadPartialTexture \"%s\": partial update of type other than 2D", glt->identifier);
-
-	if (glt->textype->textype == TEXTYPE_PALETTE)
-		Sys_Error("R_UploadPartialTexture \"%s\": partial update of paletted texture", glt->identifier);
-
-	if (glt->flags & (TEXF_MIPMAP | TEXF_PICMIP))
-		Sys_Error("R_UploadPartialTexture \"%s\": partial update not supported with MIPMAP or PICMIP flags", glt->identifier);
-
-	if (glt->inputwidth != glt->tilewidth || glt->inputheight != glt->tileheight || glt->tiledepth != 1)
-		Sys_Error("R_UploadPartialTexture \"%s\": partial update not supported with stretched or special textures", glt->identifier);
-
-	// update a portion of the image
+	int i, mip, width, height, depth;
+	GLint oldbindtexnum = 0;
+	const unsigned char *prevbuffer;
+	prevbuffer = data;
 
 	switch(vid.renderpath)
 	{
@@ -1001,234 +989,150 @@ static void R_UploadPartialTexture(gltexture_t *glt, const unsigned char *data,
 	case RENDERPATH_GL13:
 	case RENDERPATH_GL20:
 	case RENDERPATH_CGGL:
-		{
-			int oldbindtexnum;
-			CHECKGLERROR
-			// we need to restore the texture binding after finishing the upload
-			GL_ActiveTexture(0);
-			oldbindtexnum = R_Mesh_TexBound(0, gltexturetypeenums[glt->texturetype]);
-			qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
-			qglTexSubImage2D(GL_TEXTURE_2D, 0, fragx, fragy, fragwidth, fragheight, glt->glformat, glt->gltype, data);CHECKGLERROR
-			qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
-		}
+		CHECKGLERROR
+
+		// we need to restore the texture binding after finishing the upload
+		GL_ActiveTexture(0);
+		oldbindtexnum = R_Mesh_TexBound(0, gltexturetypeenums[glt->texturetype]);
+		qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
 		break;
 	case RENDERPATH_D3D9:
-#ifdef SUPPORTD3D
-		{
-			RECT d3drect;
-			D3DLOCKED_RECT d3dlockedrect;
-			int y;
-			memset(&d3drect, 0, sizeof(d3drect));
-			d3drect.left = fragx;
-			d3drect.top = fragy;
-			d3drect.right = fragx+fragwidth;
-			d3drect.bottom = fragy+fragheight;
-			if (IDirect3DTexture9_LockRect((IDirect3DTexture9*)glt->d3dtexture, 0, &d3dlockedrect, &d3drect, 0) == D3D_OK && d3dlockedrect.pBits)
-			{
-				for (y = 0;y < fragheight;y++)
-					memcpy((unsigned char *)d3dlockedrect.pBits + d3dlockedrect.Pitch * y, data + fragwidth*glt->bytesperpixel * y, fragwidth*glt->bytesperpixel);
-				IDirect3DTexture9_UnlockRect((IDirect3DTexture9*)glt->d3dtexture, 0);
-			}
-		}
-#endif
-		break;
 	case RENDERPATH_D3D10:
-		Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
-		break;
 	case RENDERPATH_D3D11:
-		Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
 		break;
 	}
-}
-
-static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data)
-{
-	int i, mip = 0, width, height, depth;
-	GLint oldbindtexnum = 0;
-	const unsigned char *prevbuffer;
-	prevbuffer = data;
 
-	// error out if a stretch is needed on special texture types
-	if (glt->texturetype != GLTEXTURETYPE_2D && (glt->tilewidth != glt->inputwidth || glt->tileheight != glt->inputheight || glt->tiledepth != glt->inputdepth))
-		Sys_Error("R_UploadFullTexture \"%s\": stretch uploads allowed only on 2D textures\n", glt->identifier);
+	// these are rounded up versions of the size to do better resampling
+	if (vid.support.arb_texture_non_power_of_two || glt->texturetype == GLTEXTURETYPE_RECTANGLE)
+	{
+		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);
+	}
 
-	// when picmip or maxsize is applied, we scale up to a power of 2 multiple
-	// of the target size and then use the mipmap reduction function to get
-	// high quality supersampled results
-	for (width  = glt->tilewidth;width  < glt->inputwidth ;width  <<= 1);
-	for (height = glt->tileheight;height < glt->inputheight;height <<= 1);
-	for (depth  = glt->tiledepth;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)
 	{
-		width = glt->tilewidth;
-		height = glt->tileheight;
-		depth = glt->tiledepth;
-		memset(resizebuffer, 0, width * height * depth * glt->sides * glt->bytesperpixel);
+		memset(resizebuffer, 0, fragwidth * fragheight * fragdepth * 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);
+		Image_Copy8bitBGRA(prevbuffer, colorconvertbuffer, fragwidth * fragheight * fragdepth * glt->sides, glt->palette);
 		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;
-	}
+	// upload the image - preferring to do only complete uploads (drivers do not really like partial updates)
 
-	// do the appropriate upload type...
-	switch(vid.renderpath)
+	if ((glt->flags & (TEXF_MIPMAP | TEXF_PICMIP)) == 0 && glt->inputwidth == glt->tilewidth && glt->inputheight == glt->tileheight && glt->inputdepth == glt->tiledepth && (fragx != 0 || fragy != 0 || fragwidth != glt->tilewidth || fragheight != glt->tileheight))
 	{
-	case RENDERPATH_GL11:
-	case RENDERPATH_GL13:
-	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
-		CHECKGLERROR
-
-		// we need to restore the texture binding after finishing the upload
-		GL_ActiveTexture(0);
-		oldbindtexnum = R_Mesh_TexBound(0, gltexturetypeenums[glt->texturetype]);
-		qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
-
-		if (qglGetCompressedTexImageARB)
-		{
-			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)
+		// update a portion of the image
+		if (glt->texturetype != GLTEXTURETYPE_2D)
+			Sys_Error("R_Upload: partial update of type other than 2D");
+		switch(vid.renderpath)
 		{
-		case GLTEXTURETYPE_2D:
-			qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
-			if (glt->flags & TEXF_MIPMAP)
+		case RENDERPATH_GL11:
+		case RENDERPATH_GL13:
+		case RENDERPATH_GL20:
+		case RENDERPATH_CGGL:
+			qglTexSubImage2D(GL_TEXTURE_2D, 0, fragx, fragy, fragwidth, fragheight, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
+			qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
+			break;
+		case RENDERPATH_D3D9:
+#ifdef SUPPORTD3D
 			{
-				while (width > 1 || height > 1 || depth > 1)
+				RECT d3drect;
+				D3DLOCKED_RECT d3dlockedrect;
+				int y;
+				memset(&d3drect, 0, sizeof(d3drect));
+				d3drect.left = fragx;
+				d3drect.top = fragy;
+				d3drect.right = fragx+fragwidth;
+				d3drect.bottom = fragy+fragheight;
+				if (IDirect3DTexture9_LockRect((IDirect3DTexture9*)glt->d3dtexture, 0, &d3dlockedrect, &d3drect, 0) == D3D_OK && d3dlockedrect.pBits)
 				{
-					Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
-					prevbuffer = resizebuffer;
-					qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
+					for (y = 0;y < fragheight;y++)
+						memcpy((unsigned char *)d3dlockedrect.pBits + d3dlockedrect.Pitch * y, (unsigned char *)prevbuffer + fragwidth*glt->bytesperpixel * y, fragwidth*glt->bytesperpixel);
+					IDirect3DTexture9_UnlockRect((IDirect3DTexture9*)glt->d3dtexture, 0);
 				}
 			}
+#endif
+			break;
+		case RENDERPATH_D3D10:
+			Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+			break;
+		case RENDERPATH_D3D11:
+			Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
 			break;
-		case GLTEXTURETYPE_3D:
-			qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
-			if (glt->flags & TEXF_MIPMAP)
+		}
+	}
+	else
+	{
+		if (fragx || fragy || fragz || glt->inputwidth != fragwidth || glt->inputheight != fragheight || glt->inputdepth != fragdepth)
+			Sys_Error("R_Upload \"%s\": partial update not allowed on initial upload or in combination with PICMIP or MIPMAP\n", glt->identifier);
+
+		// cubemaps contain multiple images and thus get processed a bit differently
+		if (glt->texturetype != GLTEXTURETYPE_CUBEMAP)
+		{
+			if (glt->inputwidth != width || glt->inputheight != height || glt->inputdepth != depth)
 			{
-				while (width > 1 || height > 1 || depth > 1)
-				{
-					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, glt->gltype, prevbuffer);CHECKGLERROR
-				}
+				Image_Resample32(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, r_lerpimages.integer);
+				prevbuffer = resizebuffer;
 			}
-			break;
-		case GLTEXTURETYPE_CUBEMAP:
-			// convert and upload each side in turn,
-			// from a continuous block of input texels
-			texturebuffer = (unsigned char *)prevbuffer;
-			for (i = 0;i < 6;i++)
+			// picmip/max_size
+			while (width > glt->tilewidth || height > glt->tileheight || depth > glt->tiledepth)
 			{
-				prevbuffer = texturebuffer;
-				texturebuffer += glt->inputwidth * glt->inputheight * glt->inputdepth * glt->textype->inputbytesperpixel;
-				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;
-				}
-				// 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;
-				}
-				mip = 0;
-				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_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
-						prevbuffer = resizebuffer;
-						qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
-					}
-				}
+				Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth);
+				prevbuffer = resizebuffer;
 			}
-			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->textype->textype, glt->texturetype);
-		qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
-		break;
-	case RENDERPATH_D3D9:
-#ifdef SUPPORTD3D
-		if (!(glt->flags & TEXF_RENDERTARGET))
+		mip = 0;
+		switch(vid.renderpath)
 		{
-			D3DLOCKED_RECT d3dlockedrect;
-			D3DLOCKED_BOX d3dlockedbox;
+		case RENDERPATH_GL11:
+		case RENDERPATH_GL13:
+		case RENDERPATH_GL20:
+		case RENDERPATH_CGGL:
+			if (qglGetCompressedTexImageARB)
+			{
+				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_2D:
-				if (IDirect3DTexture9_LockRect((IDirect3DTexture9*)glt->d3dtexture, mip, &d3dlockedrect, NULL, 0) == D3D_OK && d3dlockedrect.pBits)
-				{
-					if (prevbuffer)
-						memcpy(d3dlockedrect.pBits, prevbuffer, width*height*glt->bytesperpixel);
-					else
-						memset(d3dlockedrect.pBits, 255, width*height*glt->bytesperpixel);
-					IDirect3DTexture9_UnlockRect((IDirect3DTexture9*)glt->d3dtexture, mip);
-				}
-				mip++;
-				if ((glt->flags & TEXF_MIPMAP) && prevbuffer)
+				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_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
 						prevbuffer = resizebuffer;
-						if (IDirect3DTexture9_LockRect((IDirect3DTexture9*)glt->d3dtexture, mip, &d3dlockedrect, NULL, 0) == D3D_OK && d3dlockedrect.pBits)
-						{
-							memcpy(d3dlockedrect.pBits, prevbuffer, width*height*glt->bytesperpixel);
-							IDirect3DTexture9_UnlockRect((IDirect3DTexture9*)glt->d3dtexture, mip);
-						}
-						mip++;
+						qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
 					}
 				}
 				break;
 			case GLTEXTURETYPE_3D:
-				if (IDirect3DVolumeTexture9_LockBox((IDirect3DVolumeTexture9*)glt->d3dtexture, mip, &d3dlockedbox, NULL, 0) == D3D_OK && d3dlockedbox.pBits)
-				{
-					// we are not honoring the RowPitch or SlicePitch, hopefully this works with all sizes
-					memcpy(d3dlockedbox.pBits, prevbuffer, width*height*depth*glt->bytesperpixel);
-					IDirect3DVolumeTexture9_UnlockBox((IDirect3DVolumeTexture9*)glt->d3dtexture, mip);
-				}
-				mip++;
+				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_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
 						prevbuffer = resizebuffer;
-						if (IDirect3DVolumeTexture9_LockBox((IDirect3DVolumeTexture9*)glt->d3dtexture, mip, &d3dlockedbox, NULL, 0) == D3D_OK && d3dlockedbox.pBits)
-						{
-							// we are not honoring the RowPitch or SlicePitch, hopefully this works with all sizes
-							memcpy(d3dlockedbox.pBits, prevbuffer, width*height*depth*glt->bytesperpixel);
-							IDirect3DVolumeTexture9_UnlockBox((IDirect3DVolumeTexture9*)glt->d3dtexture, mip);
-						}
-						mip++;
+						qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
 					}
 				}
 				break;
@@ -1252,83 +1156,180 @@ static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data)
 						prevbuffer = resizebuffer;
 					}
 					mip = 0;
-					if (IDirect3DCubeTexture9_LockRect((IDirect3DCubeTexture9*)glt->d3dtexture, (D3DCUBEMAP_FACES)i, mip, &d3dlockedrect, NULL, 0) == D3D_OK && d3dlockedrect.pBits)
+					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_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
+							prevbuffer = resizebuffer;
+							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->textype->textype, glt->texturetype);
+			qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
+			break;
+		case RENDERPATH_D3D9:
+#ifdef SUPPORTD3D
+			if (!(glt->flags & TEXF_RENDERTARGET))
+			{
+				D3DLOCKED_RECT d3dlockedrect;
+				D3DLOCKED_BOX d3dlockedbox;
+				switch(glt->texturetype)
+				{
+				case GLTEXTURETYPE_2D:
+					if (IDirect3DTexture9_LockRect((IDirect3DTexture9*)glt->d3dtexture, mip, &d3dlockedrect, NULL, 0) == D3D_OK && d3dlockedrect.pBits)
 					{
-						memcpy(d3dlockedrect.pBits, prevbuffer, width*height*glt->bytesperpixel);
-						IDirect3DCubeTexture9_UnlockRect((IDirect3DCubeTexture9*)glt->d3dtexture, (D3DCUBEMAP_FACES)i, mip);
+						if (prevbuffer)
+							memcpy(d3dlockedrect.pBits, prevbuffer, width*height*glt->bytesperpixel);
+						else
+							memset(d3dlockedrect.pBits, 255, width*height*glt->bytesperpixel);
+						IDirect3DTexture9_UnlockRect((IDirect3DTexture9*)glt->d3dtexture, mip);
 					}
 					mip++;
-					if (glt->flags & TEXF_MIPMAP)
+					if ((glt->flags & TEXF_MIPMAP) && prevbuffer)
 					{
 						while (width > 1 || height > 1 || depth > 1)
 						{
 							Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
 							prevbuffer = resizebuffer;
-							if (IDirect3DCubeTexture9_LockRect((IDirect3DCubeTexture9*)glt->d3dtexture, (D3DCUBEMAP_FACES)i, mip, &d3dlockedrect, NULL, 0) == D3D_OK && d3dlockedrect.pBits)
+							if (IDirect3DTexture9_LockRect((IDirect3DTexture9*)glt->d3dtexture, mip, &d3dlockedrect, NULL, 0) == D3D_OK && d3dlockedrect.pBits)
 							{
 								memcpy(d3dlockedrect.pBits, prevbuffer, width*height*glt->bytesperpixel);
-								IDirect3DCubeTexture9_UnlockRect((IDirect3DCubeTexture9*)glt->d3dtexture, (D3DCUBEMAP_FACES)i, mip);
+								IDirect3DTexture9_UnlockRect((IDirect3DTexture9*)glt->d3dtexture, mip);
+							}
+							mip++;
+						}
+					}
+					break;
+				case GLTEXTURETYPE_3D:
+					if (IDirect3DVolumeTexture9_LockBox((IDirect3DVolumeTexture9*)glt->d3dtexture, mip, &d3dlockedbox, NULL, 0) == D3D_OK && d3dlockedbox.pBits)
+					{
+						// we are not honoring the RowPitch or SlicePitch, hopefully this works with all sizes
+						memcpy(d3dlockedbox.pBits, prevbuffer, width*height*depth*glt->bytesperpixel);
+						IDirect3DVolumeTexture9_UnlockBox((IDirect3DVolumeTexture9*)glt->d3dtexture, mip);
+					}
+					mip++;
+					if (glt->flags & TEXF_MIPMAP)
+					{
+						while (width > 1 || height > 1 || depth > 1)
+						{
+							Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
+							prevbuffer = resizebuffer;
+							if (IDirect3DVolumeTexture9_LockBox((IDirect3DVolumeTexture9*)glt->d3dtexture, mip, &d3dlockedbox, NULL, 0) == D3D_OK && d3dlockedbox.pBits)
+							{
+								// we are not honoring the RowPitch or SlicePitch, hopefully this works with all sizes
+								memcpy(d3dlockedbox.pBits, prevbuffer, width*height*depth*glt->bytesperpixel);
+								IDirect3DVolumeTexture9_UnlockBox((IDirect3DVolumeTexture9*)glt->d3dtexture, mip);
 							}
 							mip++;
 						}
 					}
+					break;
+				case GLTEXTURETYPE_CUBEMAP:
+					// convert and upload each side in turn,
+					// from a continuous block of input texels
+					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_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_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth);
+							prevbuffer = resizebuffer;
+						}
+						mip = 0;
+						if (IDirect3DCubeTexture9_LockRect((IDirect3DCubeTexture9*)glt->d3dtexture, (D3DCUBEMAP_FACES)i, mip, &d3dlockedrect, NULL, 0) == D3D_OK && d3dlockedrect.pBits)
+						{
+							memcpy(d3dlockedrect.pBits, prevbuffer, width*height*glt->bytesperpixel);
+							IDirect3DCubeTexture9_UnlockRect((IDirect3DCubeTexture9*)glt->d3dtexture, (D3DCUBEMAP_FACES)i, mip);
+						}
+						mip++;
+						if (glt->flags & TEXF_MIPMAP)
+						{
+							while (width > 1 || height > 1 || depth > 1)
+							{
+								Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
+								prevbuffer = resizebuffer;
+								if (IDirect3DCubeTexture9_LockRect((IDirect3DCubeTexture9*)glt->d3dtexture, (D3DCUBEMAP_FACES)i, mip, &d3dlockedrect, NULL, 0) == D3D_OK && d3dlockedrect.pBits)
+								{
+									memcpy(d3dlockedrect.pBits, prevbuffer, width*height*glt->bytesperpixel);
+									IDirect3DCubeTexture9_UnlockRect((IDirect3DCubeTexture9*)glt->d3dtexture, (D3DCUBEMAP_FACES)i, mip);
+								}
+								mip++;
+							}
+						}
+					}
+					break;
+				case GLTEXTURETYPE_RECTANGLE:
+					Sys_Error("Direct3D does not have RECTANGLE textures\n");
+					break;
 				}
-				break;
-			case GLTEXTURETYPE_RECTANGLE:
-				Sys_Error("Direct3D does not have RECTANGLE textures\n");
-				break;
 			}
-		}
-		glt->d3daddressw = 0;
-		if (glt->flags & TEXF_CLAMP)
-		{
-			glt->d3daddressu = D3DTADDRESS_CLAMP;
-			glt->d3daddressv = D3DTADDRESS_CLAMP;
-			if (glt->tiledepth > 1)
-				glt->d3daddressw = D3DTADDRESS_CLAMP;
-		}
-		else
-		{
-			glt->d3daddressu = D3DTADDRESS_WRAP;
-			glt->d3daddressv = D3DTADDRESS_WRAP;
-			if (glt->tiledepth > 1)
-				glt->d3daddressw = D3DTADDRESS_WRAP;
-		}
-		glt->d3dmipmaplodbias = 0;
-		glt->d3dmaxmiplevel = 0;
-		glt->d3dmaxmiplevelfilter = d3d_filter_nomip ? 0 : glt->d3dmaxmiplevel;
-		if (glt->flags & TEXF_FORCELINEAR)
-		{
-			glt->d3dminfilter = D3DTEXF_LINEAR;
-			glt->d3dmagfilter = D3DTEXF_LINEAR;
-			glt->d3dmipfilter = D3DTEXF_POINT;
-		}
-		else if (glt->flags & TEXF_FORCENEAREST)
-		{
-			glt->d3dminfilter = D3DTEXF_POINT;
-			glt->d3dmagfilter = D3DTEXF_POINT;
-			glt->d3dmipfilter = D3DTEXF_POINT;
-		}
-		else if (glt->flags & TEXF_MIPMAP)
-		{
-			glt->d3dminfilter = d3d_filter_mipmin;
-			glt->d3dmagfilter = d3d_filter_mipmag;
-			glt->d3dmipfilter = d3d_filter_mipmix;
-		}
-		else
-		{
-			glt->d3dminfilter = d3d_filter_flatmin;
-			glt->d3dmagfilter = d3d_filter_flatmag;
-			glt->d3dmipfilter = d3d_filter_flatmix;
-		}
+			glt->d3daddressw = 0;
+			if (glt->flags & TEXF_CLAMP)
+			{
+				glt->d3daddressu = D3DTADDRESS_CLAMP;
+				glt->d3daddressv = D3DTADDRESS_CLAMP;
+				if (glt->tiledepth > 1)
+					glt->d3daddressw = D3DTADDRESS_CLAMP;
+			}
+			else
+			{
+				glt->d3daddressu = D3DTADDRESS_WRAP;
+				glt->d3daddressv = D3DTADDRESS_WRAP;
+				if (glt->tiledepth > 1)
+					glt->d3daddressw = D3DTADDRESS_WRAP;
+			}
+			glt->d3dmipmaplodbias = 0;
+			glt->d3dmaxmiplevel = 0;
+			glt->d3dmaxmiplevelfilter = d3d_filter_nomip ? 0 : glt->d3dmaxmiplevel;
+			if (glt->flags & TEXF_FORCELINEAR)
+			{
+				glt->d3dminfilter = D3DTEXF_LINEAR;
+				glt->d3dmagfilter = D3DTEXF_LINEAR;
+				glt->d3dmipfilter = D3DTEXF_POINT;
+			}
+			else if (glt->flags & TEXF_FORCENEAREST)
+			{
+				glt->d3dminfilter = D3DTEXF_POINT;
+				glt->d3dmagfilter = D3DTEXF_POINT;
+				glt->d3dmipfilter = D3DTEXF_POINT;
+			}
+			else if (glt->flags & TEXF_MIPMAP)
+			{
+				glt->d3dminfilter = d3d_filter_mipmin;
+				glt->d3dmagfilter = d3d_filter_mipmag;
+				glt->d3dmipfilter = d3d_filter_mipmix;
+			}
+			else
+			{
+				glt->d3dminfilter = d3d_filter_flatmin;
+				glt->d3dmagfilter = d3d_filter_flatmag;
+				glt->d3dmipfilter = d3d_filter_flatmix;
+			}
 #endif
-		break;
-	case RENDERPATH_D3D10:
-		Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
-		break;
-	case RENDERPATH_D3D11:
-		Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
-		break;
+			break;
+		case RENDERPATH_D3D10:
+			Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+			break;
+		case RENDERPATH_D3D11:
+			Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+			break;
+		}
 	}
 }
 
@@ -1534,7 +1535,7 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 		break;
 	}
 
-	R_UploadFullTexture(glt, data);
+	R_Upload(glt, data, 0, 0, 0, glt->inputwidth, glt->inputheight, glt->inputdepth);
 	if ((glt->flags & TEXF_ALLOWUPDATES) && gl_nopartialtextureupdates.integer)
 		glt->bufferpixels = (unsigned char *)Mem_Alloc(texturemempool, glt->tilewidth*glt->tileheight*glt->tiledepth*glt->sides*glt->bytesperpixel);
 
@@ -2196,10 +2197,8 @@ void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, in
 		for (j = 0;j < height;j++, output += outputskip, input += inputskip)
 			memcpy(output, input, width*bpp);
 	}
-	else if (x || y || width != glt->inputwidth || height != glt->inputheight)
-		R_UploadPartialTexture(glt, data, x, y, 0, width, height, 1);
 	else
-		R_UploadFullTexture(glt, data);
+		R_Upload(glt, data, x, y, 0, width, height, 1);
 }
 
 int R_RealGetTexture(rtexture_t *rt)
@@ -2213,7 +2212,7 @@ int R_RealGetTexture(rtexture_t *rt)
 		if (glt->buffermodified && glt->bufferpixels)
 		{
 			glt->buffermodified = false;
-			R_UploadFullTexture(glt, glt->bufferpixels);
+			R_Upload(glt, glt->bufferpixels, 0, 0, 0, glt->tilewidth, glt->tileheight, glt->tiledepth);
 		}
 		glt->dirty = false;
 		return glt->texnum;
@@ -2226,7 +2225,7 @@ void R_ClearTexture (rtexture_t *rt)
 {
 	gltexture_t *glt = (gltexture_t *)rt;
 
-	R_UploadFullTexture(glt, NULL);
+	R_Upload( glt, NULL, 0, 0, 0, glt->tilewidth, glt->tileheight, glt->tiledepth );
 }
 
 int R_PicmipForFlags(int flags)