tr_image: rework the alpha detection

Author: illwieckz

src/engine/renderer/tr_image.cpp

@@ -1054,30 +1054,44 @@ void R_UploadImage( const char *name, const byte **dataArray, int numLayers, int
 	}
 	else
 	{
-		// scan the texture for each channel's max values
-		// and verify if the alpha channel is being used or not
+		// lightmap does not have alpha channel
+		if ( image->bits & IF_LIGHTMAP )
+		{
+			internalFormat = GL_RGB8;
+		}
+		else
+		{
+			internalFormat = GL_RGBA8;
+		}
+	}
 
-		c = image->width * image->height;
-		scan = dataArray[0];
+	// Detect formats.
+	if ( dataArray )
+	{
+		if ( internalFormat == GL_RGBA8 )
+		{
+			/* Scan the texture for alpha channel's max values
+			and verify if the alpha channel is being used or not. */
 
-		// lightmap does not have alpha channel
+			c = image->width * image->height;
+			scan = dataArray[0];
 
-		// normalmap may have the heightmap in the alpha channel
-		// opaque alpha channel means no displacement, so we can enable
-		// alpha channel everytime it is used, even for normalmap
+			/* A normalmap may have the heightmap in the alpha channel,
+			an opaque alpha channel means no displacement, so we can enable
+			the alpha channel everytime it is used, even for normalmap. */
 
-		internalFormat = GL_RGB8;
+			internalFormat = GL_RGB8;
 
-		if ( !( image->bits & IF_LIGHTMAP ) )
-		{
-			for ( i = 0; i < c; i++ )
+			for ( i = 0; i < c * 4; i += 4 )
 			{
-				if ( scan[ i * 4 + 3 ] != 255 )
+				if ( scan[ i + 3 ] != 255 )
 				{
 					internalFormat = GL_RGBA8;
 					break;
 				}
 			}
+
+			internalFormat = hasAlpha ? GL_RGBA8 : GL_RGB8;
 		}
 	}