Fix tonemapping enablement regression

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -419,6 +419,7 @@ struct addedExtension_t {
 static const std::vector<addedExtension_t> fragmentVertexAddedExtensions = {
 	{ glConfig2.gpuShader4Available, 130, "EXT_gpu_shader4" },
 	{ glConfig2.gpuShader5Available, 400, "ARB_gpu_shader5" },
+	{ glConfig2.textureFloatAvailable, 130, "ARB_texture_float" },
 	{ glConfig2.textureGatherAvailable, 400, "ARB_texture_gather" },
 	{ glConfig2.textureIntegerAvailable, 0, "EXT_texture_integer" },
 	{ glConfig2.textureRGAvailable, 0, "ARB_texture_rg" },
@@ -866,6 +867,10 @@ static std::string GenEngineConstants() {
 		AddDefine( str, "r_colorGrading", 1 );
 	}
 
+	if ( r_highPrecisionRendering.Get() ) {
+		AddDefine( str, "r_highPrecisionRendering", 1 );
+	}
+
 	return str;
 }
 

src/engine/renderer/glsl_source/cameraEffects_fp.glsl

@@ -25,44 +25,45 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 uniform sampler2D u_CurrentMap;
 
 #if defined(r_colorGrading)
-uniform sampler3D u_ColorMap3D;
+	uniform sampler3D u_ColorMap3D;
 #endif
 
-uniform vec4      u_ColorModulate;
-uniform float     u_GlobalLightFactor; // 1 / tr.identityLight
-uniform float     u_InverseGamma;
+uniform vec4 u_ColorModulate;
+uniform float u_GlobalLightFactor; // 1 / tr.identityLight
+uniform float u_InverseGamma;
 
-IN(smooth) vec2		var_TexCoords;
+IN(smooth) vec2 var_TexCoords;
 
 DECLARE_OUTPUT(vec4)
 
 // Tone mapping is not available when high-precision float framebuffer isn't enabled or supported.
 #if defined(r_highPrecisionRendering) && defined(HAVE_ARB_texture_float)
-/* x: contrast
-y: highlightsCompressionSpeed
-z: shoulderClip
-w: highlightsCompression */
-uniform bool u_Tonemap;
-uniform vec4 u_TonemapParms;
-uniform float u_TonemapExposure;
-
-vec3 TonemapLottes( vec3 color ) {
-  // Lottes 2016, "Advanced Techniques and Optimization of HDR Color Pipelines"
-  return pow( color, vec3( u_TonemapParms[0] ) )
-         / ( pow( color, vec3( u_TonemapParms[0] * u_TonemapParms[1] ) ) * u_TonemapParms[2] + u_TonemapParms[3] );
-}
+	/* x: contrast
+	y: highlightsCompressionSpeed
+	z: shoulderClip
+	w: highlightsCompression */
+	uniform bool u_Tonemap;
+	uniform vec4 u_TonemapParms;
+	uniform float u_TonemapExposure;
+
+	vec3 TonemapLottes( vec3 color ) {
+	  // Lottes 2016, "Advanced Techniques and Optimization of HDR Color Pipelines"
+	  return pow( color, vec3( u_TonemapParms[0] ) )
+			 / ( pow( color, vec3( u_TonemapParms[0] * u_TonemapParms[1] ) ) * u_TonemapParms[2] + u_TonemapParms[3] );
+	}
 #endif
 
-void main()
-{
+void main() {
 	// calculate the screen texcoord in the 0.0 to 1.0 range
 	vec2 st = gl_FragCoord.st / r_FBufSize;
 
 	vec4 color = texture2D(u_CurrentMap, st);
 	color *= u_GlobalLightFactor;
 
 #if defined(r_highPrecisionRendering) && defined(HAVE_ARB_texture_float)
-	color.rgb = TonemapLottes( color.rgb * u_TonemapExposure );
+	if( u_Tonemap ) {
+		color.rgb = TonemapLottes( color.rgb * u_TonemapExposure );
+	}
 #endif
 
 	color.rgb = clamp( color.rgb, vec3( 0.0f ), vec3( 1.0f ) );