test

Author: VReaperV

src/engine/renderer/glsl_source/cameraEffects_fp.glsl

@@ -55,12 +55,12 @@ vec3 TonemapLottes( vec3 color ) {
 
 #if defined(HAVE_ARB_explicit_uniform_location) && defined(HAVE_ARB_shader_atomic_counters)
 	layout(std140, binding = BIND_LUMINANCE) uniform ub_LuminanceUBO {
-		uint luminanceU;
+		uvec2 luminanceU;
 	};
 #endif
 
 float GetAverageLuminance( const in uint luminance ) {
-    return float( luminanceU ) / ( u_TonemapParms2[1] * u_ViewWidth * u_ViewHeight );
+    return float( luminance ) / ( u_TonemapParms2[1] * u_ViewWidth * u_ViewHeight );
 }
 #endif
 
@@ -77,7 +77,7 @@ void main() {
 	if( u_Tonemap ) {
 		#if defined(HAVE_ARB_explicit_uniform_location) && defined(HAVE_ARB_shader_atomic_counters)
 			if( u_TonemapAdaptiveExposure ) {
-					const float l = GetAverageLuminance( luminanceU ) - 8;
+					const float l = GetAverageLuminance( luminanceU.x ) - 8;
 					color.rgb *= clamp( 0.18f / exp2( l * 0.8f + 0.1f ), 0.0f, 2.0f );
 			}
 		#endif

src/engine/renderer/glsl_source/clearFrameData_cp.glsl

@@ -38,16 +38,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 layout (local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 
-layout(std430, binding = BIND_LUMINANCE_STORAGE) writeonly buffer luminanceBuffer {
-    uint luminance;
+layout(std430, binding = BIND_LUMINANCE_STORAGE) restrict buffer luminanceBuffer {
+	uvec2 luminance;
 };
 
 uniform uint u_Frame;
 
 void main() {
-    const uint globalInvocationID = GLOBAL_INVOCATION_ID;
-    if( globalInvocationID >= 1 ) {
-        return;
-    }
-    luminance = 0;
+	const uint globalInvocationID = GLOBAL_INVOCATION_ID;
+	if( globalInvocationID >= 1 ) {
+		return;
+	}
+	luminance.x = uint( 0.15f * luminance.y + ( 1.0f - 0.15f ) * luminance.x );
 }

src/engine/renderer/glsl_source/luminanceReduction_cp.glsl

@@ -50,7 +50,7 @@ z: reserved
 w: reserved */
 uniform vec4 u_TonemapParms2;
 
-layout (binding = BIND_LUMINANCE) uniform atomic_uint atomicLuminance;
+layout (binding = BIND_LUMINANCE) uniform atomic_uint atomicLuminance[2];
 
 float ColorToLuminance( const in vec3 color ) {
     float luminance = dot( color.rgb, vec3( 0.2126f, 0.7152f, 0.0722f ) ); // sRGB luminance
@@ -78,9 +78,9 @@ void main() {
 		const float luminanceSum = subgroupInclusiveAdd( luminance );
 
 		if( subgroupElect() ) {
-			atomicCounterAddARB( atomicLuminance, FloatLuminanceToUint( luminanceSum ) );
+			atomicCounterAddARB( atomicLuminance[1], FloatLuminanceToUint( luminanceSum ) );
 		}
     #else
-        atomicCounterAddARB( atomicLuminance, FloatLuminanceToUint( luminance ) );
+        atomicCounterAddARB( atomicLuminance[1], FloatLuminanceToUint( luminance ) );
     #endif
 }

src/engine/renderer/tr_backend.cpp

@@ -3214,8 +3214,8 @@ void RB_FXAA()
 static void AdaptiveLightingReduction() {
 	luminanceBuffer.BindBufferBase( GL_SHADER_STORAGE_BUFFER, Util::ordinal( BufferBind::LUMINANCE_STORAGE ) );
 
-	gl_clearFrameDataShader->BindProgram( 0 );
-	gl_clearFrameDataShader->DispatchCompute( 1, 1, 1 );
+	// gl_clearFrameDataShader->BindProgram( 0 );
+	// gl_clearFrameDataShader->DispatchCompute( 1, 1, 1 );
 
 	luminanceBuffer.BindBufferBase( GL_ATOMIC_COUNTER_BUFFER, Util::ordinal( BufferBind::LUMINANCE ) );
 
@@ -3239,7 +3239,10 @@ static void AdaptiveLightingReduction() {
 
 	gl_luminanceReductionShader->DispatchCompute( globalWorkgroupX, globalWorkgroupY, 1 );
 
-	glMemoryBarrier( GL_UNIFORM_BARRIER_BIT );
+	glMemoryBarrier( GL_SHADER_STORAGE_BARRIER_BIT | GL_UNIFORM_BARRIER_BIT );
+
+	gl_clearFrameDataShader->BindProgram( 0 );
+	gl_clearFrameDataShader->DispatchCompute( 1, 1, 1 );
 }
 
 static void ComputeTonemapParams( const float contrast, const float highlightsCompressionSpeed,

src/engine/renderer/tr_vbo.cpp

@@ -783,7 +783,8 @@ void R_InitVBOs()
 
 	if ( glConfig2.adaptiveExposureAvailable ) {
 		luminanceBuffer.GenBuffer();
-		luminanceBuffer.BufferData( 1, nullptr, GL_DYNAMIC_COPY );
+		uint32_t data[2] {};
+		luminanceBuffer.BufferData( 2, data, GL_DYNAMIC_COPY );
 	}
 
 	GL_CheckErrors();