From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 26 Jan 2012 17:24:57 +0000 (+0000)
Subject: fix avgcolor calculation when loading dds
X-Git-Tag: xonotic-v0.6.0~48
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=10ae5765f095f13ad18a440b420c3ff9e27f9041;p=xonotic%2Fdarkplaces.git

fix avgcolor calculation when loading dds

Fixes "black screen with r_showsurfaces 3" bug

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11660 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=397496e4d2d23ef2e0d5c6aa18b33cf92b53eba8
---

diff --git a/gl_textures.c b/gl_textures.c
index 2a81cf50..cf6c768e 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -2457,7 +2457,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen
 				avgcolor[1] += ((c >>  5) & 0x3F) + ((c >> 21) & 0x3F);
 				avgcolor[2] += ((c      ) & 0x1F) + ((c >> 16) & 0x1F);
 				if(textype == TEXTYPE_DXT5)
-					avgcolor[3] += (0.5 * mippixels[i-8] + 0.5 * mippixels[i-7]);
+					avgcolor[3] += (mippixels[i-8] + (int) mippixels[i-7]) * (0.5f / 255.0f);
 				else if(textype == TEXTYPE_DXT3)
 					avgcolor[3] += (
 						  (mippixels_start[i-8] & 0x0F)
@@ -2468,11 +2468,11 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen
 						+ (mippixels_start[i-6] >> 4)
 						+ (mippixels_start[i-5] & 0x0F)
 						+ (mippixels_start[i-5] >> 4)
-					       ) * (0.125f / 15.0f * 255.0f);
+					       ) * (0.125f / 15.0f);
 				else
-					avgcolor[3] += 255;
+					avgcolor[3] += 1.0f;
 			}
-			f = (float)bytesperblock / size;
+			f = (float)bytesperblock / mipsize;
 			avgcolor[0] *= (0.5f / 31.0f) * f;
 			avgcolor[1] *= (0.5f / 63.0f) * f;
 			avgcolor[2] *= (0.5f / 31.0f) * f;
@@ -2487,7 +2487,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen
 				avgcolor[2] += mippixels[i];
 				avgcolor[3] += mippixels[i+3];
 			}
-			f = (1.0f / 255.0f) * bytesperpixel / size;
+			f = (1.0f / 255.0f) * bytesperpixel / mipsize;
 			avgcolor[0] *= f;
 			avgcolor[1] *= f;
 			avgcolor[2] *= f;