srgb u_LinearizeTexture - use normal bitwise ops

Author: slipher

Diff for: src/engine/renderer/glsl_source/lightMapping_fp.glsl

@@ -110,13 +110,9 @@ void main()
 		return;
 	}
 
-	/* HACK: emulate three-bits bitfield
-	even: no color map linearization (first bit)
-	less than 2: no light map linearization (second bit)
-	positive: no material map linearization (extra bit) */
-	bool linearizeColorMap = bool(u_LinearizeTexture % 2);
-	bool linearizeLightMap = abs(u_LinearizeTexture) > 1;
-	bool linearizeMaterialMap = u_LinearizeTexture < 0;
+	bool linearizeColorMap = ( u_LinearizeTexture & 0x1 ) != 0;
+	bool linearizeLightMap = ( u_LinearizeTexture & 0x2 ) != 0;
+	bool linearizeMaterialMap = ( u_LinearizeTexture & 0x4 ) != 0;
 
 	convertFromSRGB(diffuse.rgb, linearizeColorMap);
 

Diff for: src/engine/renderer/tr_shader.cpp

@@ -4767,7 +4767,9 @@ static int packLinearizeTexture( bool linearizeColorMap, bool linearizeMaterialM
 	even: no color map linearization (first bit)
 	less than 2: no light map linearization (second bit)
 	positive: no material map linearization (extra bit) */
-	return ( int(linearizeColorMap) + ( 2 * int(linearizeLightMap) ) ) * ( linearizeMaterialMap ? -1 : 1 );
+	return linearizeColorMap << 0
+	     | linearizeLightMap << 1
+	     | linearizeMaterialMap << 2;
 }
 
 /*