Fix luminance overflow

Author: VReaperV

src/engine/renderer/gl_shader.cpp

@@ -2835,7 +2835,7 @@ void GLShader_shadowFill::SetShaderProgramUniforms( ShaderProgramDescriptor *sha
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_ColorMap" ), 0 );
 }
 
-GLShader_luminanceReduction::GLShader_luminanceReduction( GLShaderManager* manager ) :
+GLShader_luminanceReduction::GLShader_luminanceReduction() :
 	GLShader( "luminanceReduction",
 		false, "luminanceReduction" ),
 	u_ViewWidth( this ),
@@ -2847,7 +2847,7 @@ void GLShader_luminanceReduction::SetShaderProgramUniforms( ShaderProgramDescrip
 	glUniform1i( glGetUniformLocation( shaderProgram->id, "initialRenderImage" ), 0 );
 }
 
-GLShader_clearFrameData::GLShader_clearFrameData( GLShaderManager* manager ) :
+GLShader_clearFrameData::GLShader_clearFrameData() :
 	GLShader( "clearFrameData",
 		false, "clearFrameData" ) {
 }
@@ -3115,6 +3115,7 @@ GLShader_cameraEffects::GLShader_cameraEffects() :
 	u_Tonemap( this ),
 	u_TonemapAdaptiveExposure( this ),
 	u_TonemapParms( this ),
+	u_TonemapParms2( this ),
 	u_TonemapExposure( this ),
 	u_InverseGamma( this ) {
 }

src/engine/renderer/gl_shader.h

@@ -4529,14 +4529,14 @@ class GLShader_luminanceReduction :
 	public u_ViewHeight,
 	public u_TonemapParms2 {
 	public:
-	GLShader_luminanceReduction( GLShaderManager* manager );
+	GLShader_luminanceReduction();
 	void SetShaderProgramUniforms( ShaderProgramDescriptor* shaderProgram ) override;
 };
 
 class GLShader_clearFrameData :
 	public GLShader {
 	public:
-	GLShader_clearFrameData( GLShaderManager* manager );
+	GLShader_clearFrameData();
 };
 
 class GLShader_reflection :
@@ -4756,6 +4756,7 @@ class GLShader_cameraEffects :
 	public u_Tonemap,
 	public u_TonemapAdaptiveExposure,
 	public u_TonemapParms,
+	public u_TonemapParms2,
 	public u_TonemapExposure,
 	public u_InverseGamma
 {

src/engine/renderer/glsl_source/cameraEffects_fp.glsl

@@ -44,6 +44,7 @@ y: highlightsCompressionSpeed
 z: shoulderClip
 w: highlightsCompression */
 uniform vec4 u_TonemapParms;
+uniform vec4 u_TonemapParms2;
 uniform float u_TonemapExposure;
 
 vec3 TonemapLottes( vec3 color ) {
@@ -59,7 +60,7 @@ vec3 TonemapLottes( vec3 color ) {
 #endif
 
 float GetAverageLuminance( const in uint luminance ) {
-    return float( luminanceU ) / ( 256.0f * u_ViewWidth * u_ViewHeight );
+    return float( luminanceU ) / ( u_TonemapParms2[1] * u_ViewWidth * u_ViewHeight );
 }
 #endif
 

src/engine/renderer/glsl_source/luminanceReduction_cp.glsl

@@ -63,7 +63,7 @@ float ColorToLuminance( const in vec3 color ) {
 }
 
 uint FloatLuminanceToUint( const in float luminance ) {
-    return uint( luminance * 256 );
+    return uint( luminance * u_TonemapParms2[1] );
 }
 
 void main() {

src/engine/renderer/tr_backend.cpp

@@ -3221,8 +3221,8 @@ static void AdaptiveLightingReduction() {
 
 	gl_luminanceReductionShader->BindProgram( 0 );
 
-	const int width = tr.currentRenderImage[backEnd.currentMainFBO]->width;
-	const int height = tr.currentRenderImage[backEnd.currentMainFBO]->height;
+	const int width = glConfig.vidWidth;
+	const int height = glConfig.vidHeight;
 
 	uint32_t globalWorkgroupX = ( width + 7 ) / 8;
 	uint32_t globalWorkgroupY = ( height + 7 ) / 8;
@@ -3232,6 +3232,7 @@ static void AdaptiveLightingReduction() {
 	gl_luminanceReductionShader->SetUniform_ViewWidth( width );
 	gl_luminanceReductionShader->SetUniform_ViewHeight( height );
 	vec4_t parms { log2f( r_toneMappingHDRMax.Get() ) };
+	parms[1] = UINT32_MAX / ( width * height * ( uint32_t( parms[0] ) + 8 ) );
 	gl_luminanceReductionShader->SetUniform_TonemapParms2( parms );
 
 	glMemoryBarrier( GL_ATOMIC_COUNTER_BARRIER_BIT );
@@ -3299,6 +3300,10 @@ void RB_CameraPostFX() {
 			r_toneMappingDarkAreaPointHDR.Get(), r_toneMappingDarkAreaPointLDR.Get(), tonemapParms[2], tonemapParms[3] );
 		gl_cameraEffectsShader->SetUniform_TonemapParms( tonemapParms );
 
+		vec4_t parms{ log2f( r_toneMappingHDRMax.Get() ) };
+		parms[1] = UINT32_MAX / ( glConfig.vidWidth * glConfig.vidHeight * ( uint32_t( parms[0] ) + 8 ) );
+		gl_cameraEffectsShader->SetUniform_TonemapParms2( parms );
+
 		gl_cameraEffectsShader->SetUniform_TonemapAdaptiveExposure(
 			glConfig2.adaptiveExposureAvailable && r_toneMappingAdaptiveExposure.Get() );
 		gl_cameraEffectsShader->SetUniform_TonemapExposure( r_toneMappingExposure.Get() );