Fix tonemapping and apply saturation even if tonemapping is disabled

client/shaders/second_stage/opengl_fragment.glsl

@@ -61,23 +61,26 @@ vec3 uncharted2Tonemap(vec3 x)
 
 vec4 applyToneMapping(vec4 color)
 {
-	const float exposureBias = 2.0;
+	color = vec4(pow(color.rgb, vec3(2.2)), color.a);
+	const float gamma = 1.6;
+	const float exposureBias = 5.5;
 	color.rgb = uncharted2Tonemap(exposureBias * color.rgb);
 	// Precalculated white_scale from
 	//vec3 whiteScale = 1.0 / uncharted2Tonemap(vec3(W));
 	vec3 whiteScale = vec3(1.036015346);
 	color.rgb *= whiteScale;
-	return color;
+	return vec4(pow(color.rgb, vec3(1.0 / gamma)), color.a);
 }
 
+#endif
+
 vec3 applySaturation(vec3 color, float factor)
 {
 	// Calculate the perceived luminosity from the RGB color.
 	// See also: https://www.w3.org/WAI/GL/wiki/Relative_luminance
 	float brightness = dot(color, vec3(0.2125, 0.7154, 0.0721));
 	return mix(vec3(brightness), color, factor);
 }
-#endif
 
 void main(void)
 {
@@ -92,6 +95,17 @@ void main(void)
 	vec4 color = texture2D(rendered, uv).rgba;
 #endif
 
+#ifdef ENABLE_BLOOM_DEBUG
+	if (uv.x > 0.5 || uv.y > 0.5)
+#endif
+	{
+#if ENABLE_TONE_MAPPING
+		color = applyToneMapping(color);
+#endif
+
+		color.rgb = applySaturation(color.rgb, saturation);
+	}
+
 	// translate to linear colorspace (approximate)
 	color.rgb = pow(color.rgb, vec3(2.2));
 
@@ -110,15 +124,6 @@ void main(void)
 	color = applyBloom(color, uv);
 #endif
 
-#ifdef ENABLE_BLOOM_DEBUG
-	if (uv.x > 0.5 || uv.y > 0.5)
-#endif
-	{
-#if ENABLE_TONE_MAPPING
-		color = applyToneMapping(color);
-		color.rgb = applySaturation(color.rgb, saturation);
-#endif
-	}
 
 	color.rgb = clamp(color.rgb, vec3(0.), vec3(1.));