another sanity refactor

Author: devshgraphicsprogramming

examples_tests/23.Autoexposure/main.cpp

@@ -81,7 +81,7 @@ int main()
 	const auto inputColorSpace = std::make_tuple(inFormat,ECP_SRGB,EOTF_IDENTITY);
 
 	using LumaMeterClass = ext::LumaMeter::CLumaMeter;
-	constexpr auto MeterMode = LumaMeterClass::EMM_GEOM_MEAN;
+	constexpr auto MeterMode = LumaMeterClass::EMM_MEDIAN;
 	const float minLuma = 1.f/2048.f;
 	const float maxLuma = 65536.f;
 

include/nbl/builtin/glsl/ext/LumaMeter/common.glsl

@@ -255,7 +255,9 @@ layout(set=_NBL_GLSL_EXT_LUMA_METER_INPUT_IMAGE_SET_DEFINED_, binding=_NBL_GLSL_
         int layerIndex = nbl_glsl_ext_LumaMeter_getCurrentLumaOutputOffset();
         #if NBL_GLSL_EQUAL(_NBL_GLSL_EXT_LUMA_METER_MODE_DEFINED_,_NBL_GLSL_EXT_LUMA_METER_MODE_MEDIAN)
             uint globalIndex = gl_LocalInvocationIndex;
-            globalIndex += (gl_WorkGroupID.x&uint(_NBL_GLSL_EXT_LUMA_METER_BIN_GLOBAL_REPLICATION-1))*_NBL_GLSL_EXT_LUMA_METER_BIN_COUNT;
+            // assert(_NBL_GLSL_EXT_LUMA_METER_BIN_COUNT==_NBL_GLSL_WORKGROUP_SIZE_)
+            const uint workgroupHash = gl_WorkGroupID.x+gl_WorkGroupID.y*gl_NumWorkGroups.x;
+            globalIndex += (workgroupHash&uint(_NBL_GLSL_EXT_LUMA_METER_BIN_GLOBAL_REPLICATION-1))*_NBL_GLSL_WORKGROUP_SIZE_;
 		    atomicAdd(outParams[layerIndex].packedHistogram[globalIndex],writeOutVal);
         #else
 		    if (gl_LocalInvocationIndex==0u)

include/nbl/builtin/glsl/ext/LumaMeter/impl.glsl

@@ -38,7 +38,7 @@ void nbl_glsl_ext_LumaMeter(in bool wgExecutionMask);
 
 float nbl_glsl_ext_LumaMeter_local_process(in bool wgExecutionMask, in vec3 color)
 {
-	float scaledLogLuma;
+	float scaledLogLuma = 0.f; // this default kind-of makes sense
 	// linearize
 	if (wgExecutionMask)
 	{
@@ -58,7 +58,7 @@ float nbl_glsl_ext_LumaMeter_local_process(in bool wgExecutionMask, in vec3 colo
 		int histogramIndex;
 		if (wgExecutionMask)
 		{
-			histogramIndex = int(scaledLogLuma *float(_NBL_GLSL_EXT_LUMA_METER_BIN_COUNT-1u)+0.5);
+			histogramIndex = int(scaledLogLuma*float(_NBL_GLSL_EXT_LUMA_METER_BIN_COUNT-1u)+0.5);
 			histogramIndex += int(gl_LocalInvocationIndex&uint(_NBL_GLSL_EXT_LUMA_METER_LOCAL_REPLICATION-1))*_NBL_GLSL_EXT_LUMA_METER_PADDED_BIN_COUNT;
 		}
 		// barrier so we "see" the cleared histogram
@@ -76,7 +76,7 @@ float nbl_glsl_ext_LumaMeter_local_process(in bool wgExecutionMask, in vec3 colo
 #include "nbl/builtin/glsl/workgroup/arithmetic.glsl"
 #endif
 
-nbl_glsl_ext_LumaMeter_WriteOutValue_t nbl_glsl_ext_LumaMeter_workgroup_process(in bool wgExecutionMask, in float scaledLogLuma)
+nbl_glsl_ext_LumaMeter_WriteOutValue_t nbl_glsl_ext_LumaMeter_workgroup_process(in float scaledLogLuma)
 {
 	#if _NBL_GLSL_EXT_LUMA_METER_MODE_DEFINED_==_NBL_GLSL_EXT_LUMA_METER_MODE_MEDIAN
 		// join the histograms across workgroups
@@ -85,7 +85,7 @@ nbl_glsl_ext_LumaMeter_WriteOutValue_t nbl_glsl_ext_LumaMeter_workgroup_process(
 			writeOutVal += _NBL_GLSL_SCRATCH_SHARED_DEFINED_[gl_LocalInvocationIndex+i*_NBL_GLSL_EXT_LUMA_METER_PADDED_BIN_COUNT];
 		return writeOutVal;
 	#elif _NBL_GLSL_EXT_LUMA_METER_MODE_DEFINED_==_NBL_GLSL_EXT_LUMA_METER_MODE_GEOM_MEAN
-		return nbl_glsl_workgroupAdd(wgExecutionMask ? scaledLogLuma:0.f);
+		return nbl_glsl_workgroupAdd(scaledLogLuma);
 	#endif
 }
 
@@ -100,7 +100,7 @@ void nbl_glsl_ext_LumaMeter(in bool wgExecutionMask)
 	nbl_glsl_ext_LumaMeter_clearFirstPassOutput();
 
 	const float scaledLogLuma = nbl_glsl_ext_LumaMeter_local_process(wgExecutionMask,color);
-	const nbl_glsl_ext_LumaMeter_WriteOutValue_t writeOutVal = nbl_glsl_ext_LumaMeter_workgroup_process(wgExecutionMask,scaledLogLuma);
+	const nbl_glsl_ext_LumaMeter_WriteOutValue_t writeOutVal = nbl_glsl_ext_LumaMeter_workgroup_process(scaledLogLuma);
 
 	nbl_glsl_ext_LumaMeter_setFirstPassOutput(writeOutVal);
 }