overbright after linearization

Author: illwieckz

src/engine/renderer/glsl_source/computeLight_fp.glsl

@@ -49,12 +49,32 @@ vec4 EnvironmentalSpecularFactor( vec3 viewDir, vec3 normal )
 
 // lighting helper functions
 
+#if defined(USE_LIGHT_MAPPING)
+	void TransformLightMap( inout vec3 lightColor, in float lightFactor, bool linearizeLightMap )
+	{
+		convertFromSRGB(lightColor, linearizeLightMap);
+
+		// When doing vertex lighting with full-range overbright, this reads out
+		// 1<<overbrightBits and serves for the overbright shift for vertex colors.
+		lightColor *= lightFactor;
+	}
+#endif
+
 #if defined(USE_GRID_LIGHTING) || defined(USE_GRID_DELUXE_MAPPING)
-	void ReadLightGrid( in vec4 texel, in float lightFactor, out vec3 ambientColor, out vec3 lightColor ) {
+	void ReadLightGrid( in vec4 texel, in float lightFactor, in bool linearizeLightMap, out vec3 ambientColor, out vec3 lightColor) {
 		float ambientScale = 2.0 * texel.a;
 		float directedScale = 2.0 - ambientScale;
 		ambientColor = ambientScale * texel.rgb;
 		lightColor = directedScale * texel.rgb;
+
+		#if defined(r_cheapSRGB)
+			/* The light grid conversion from sRGB is done in C++ code
+			when loading it, meaning it's done before interpolation. */
+		#else
+			convertFromSRGB(lightColor, linearizeLightMap);
+			convertFromSRGB(ambientColor, linearizeLightMap);
+		#endif
+
 		ambientColor *= lightFactor;
 		lightColor *= lightFactor;
 	}

src/engine/renderer/glsl_source/lightMapping_fp.glsl

@@ -162,27 +162,13 @@ void main()
 	float lightFactor = ColorModulateToLightFactor( u_ColorModulateColorGen );
 	#if defined(USE_LIGHT_MAPPING)
 		// Compute light color from world space lightmap.
-		// When doing vertex lighting with full-range overbright, this reads out
-		// 1<<overbrightBits and serves for the overbright shift for vertex colors.
 		vec3 lightColor = texture2D(u_LightMap, var_TexLight).rgb;
-		lightColor *= lightFactor;
-
-		convertFromSRGB(lightColor, linearizeLightMap);
-
+		TransformLightMap(lightColor, lightFactor, linearizeLightMap);
 		color.rgb = vec3(0.0);
 	#else
 		// Compute light color from lightgrid.
 		vec3 ambientColor, lightColor;
-		ReadLightGrid(texture3D(u_LightGrid1, lightGridPos), lightFactor, ambientColor, lightColor);
-
-		#if defined(r_cheapSRGB)
-			/* The light grid conversion from sRGB is done in C++ code
-			when loading it, meaning it's done before interpolation. */
-		#else
-			convertFromSRGB(lightColor, linearizeLightMap);
-			convertFromSRGB(ambientColor, linearizeLightMap);
-		#endif
-
+		ReadLightGrid(texture3D(u_LightGrid1, lightGridPos), lightFactor, linearizeLightMap, ambientColor, lightColor);
 		color.rgb = ambientColor * r_AmbientScale * diffuse.rgb;
 	#endif