From: cloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 29 Nov 2020 21:50:23 +0000 (+0000)
Subject: gl_textures: Totally disable the partial update codepath until it can be done correctly.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31914bb29ee06c63ad9a2fd93ba5604396bcc69c;p=xonotic%2Fdarkplaces.git

gl_textures: Totally disable the partial update codepath until it can be done correctly.

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

diff --git a/gl_textures.c b/gl_textures.c
index 6a6aa5c0..0bb0a293 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -2277,7 +2277,7 @@ void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, in
 		return;
 	}
 	// update part of the texture
-	if (glt->bufferpixels && (x || y || z || width != glt->inputwidth || height != glt->inputheight || depth != glt->inputdepth))
+	if (glt->bufferpixels || (glt->bufferpixels && (x || y || z || width != glt->inputwidth || height != glt->inputheight || depth != glt->inputdepth)))
 	{
 		int j;
 		int bpp = glt->bytesperpixel;
@@ -2307,7 +2307,7 @@ void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, in
 			return;
 
 		output += y*outputskip + x*bpp;
-
+		/* Cloudwalk FIXME: Broken shit, disabled for now.
 		// TODO: Optimize this further.
 		if(!gl_nopartialtextureupdates.integer)
 		{
@@ -2336,6 +2336,7 @@ void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, in
 			if(!&glt->modifiedpixels || &output < &glt->modifiedpixels)
 				glt->modifiedpixels = output;
 		}
+		*/
 
 		for (j = 0;j < height;j++, output += outputskip, input += inputskip)
 			memcpy(output, input, width*bpp);