clean up push constant usage, more values in push constant

Author: keptsecret

26_Autoexposure/app_resources/avg_luma_meter.comp.hlsl

@@ -63,7 +63,9 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     TexAccessor tex;
 
     using LumaMeter = luma_meter::geom_meter< WorkgroupSize, PtrAccessor, SharedAccessor, TexAccessor>;
-    LumaMeter meter = LumaMeter::create(pushData.lumaMinMax, pushData.sampleCount);
+    LumaMeter meter = LumaMeter::create(pushData.lumaMin, pushData.lumaMax, pushData.sampleCount, pushData.rcpFirstPassWGCount);
 
-    meter.sampleLuma(pushData.window, val_accessor, tex, sdata, (float32_t2)(glsl::gl_WorkGroupID() * glsl::gl_WorkGroupSize()), pushData.viewportSize);
+    uint32_t texWidth, texHeight;
+    texture.GetDimensions(texWidth, texHeight);
+    meter.sampleLuma(pushData.window, val_accessor, tex, sdata, (float32_t2)(glsl::gl_WorkGroupID() * glsl::gl_WorkGroupSize()), float32_t2(texWidth, texHeight));
 }

26_Autoexposure/app_resources/avg_luma_tonemap.comp.hlsl

@@ -68,7 +68,7 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     TexAccessor tex;
 
     using LumaMeter = luma_meter::geom_meter< WorkgroupSize, PtrAccessor, SharedAccessor, TexAccessor>;
-    LumaMeter meter = LumaMeter::create(pushData.lumaMinMax, pushData.sampleCount);
+    LumaMeter meter = LumaMeter::create(pushData.lumaMin, pushData.lumaMax, pushData.sampleCount, pushData.rcpFirstPassWGCount);
 
     float32_t EV = meter.gatherLuma(val_accessor);
 

26_Autoexposure/app_resources/common.hlsl

@@ -16,10 +16,18 @@ namespace hlsl
 struct AutoexposurePushData
 {
     luma_meter::MeteringWindow window;
-    float32_t2 lumaMinMax;
-    float32_t sampleCount;
+    float32_t lumaMin;
+    float32_t lumaMax;
     uint32_t2 viewportSize;
     uint64_t lumaMeterBDA;
+
+    // mean only
+    float32_t sampleCount;
+    float32_t rcpFirstPassWGCount;
+
+    // histogram only
+    float32_t lowerBoundPercentile;
+    float32_t upperBoundPercentile;
 };
 
 #ifdef __HLSL_VERSION

26_Autoexposure/app_resources/median_luma_meter.comp.hlsl

@@ -69,7 +69,9 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     TexAccessor tex;
 
     using LumaMeter = luma_meter::median_meter< WorkgroupSize, BIN_COUNT, PtrAccessor, SharedAccessor, TexAccessor>;
-    LumaMeter meter = LumaMeter::create(pushData.lumaMinMax);
+    LumaMeter meter = LumaMeter::create(pushData.lumaMin, pushData.lumaMax, pushData.lowerBoundPercentile, pushData.upperBoundPercentile);
 
-    meter.sampleLuma(pushData.window, histo_accessor, tex, sdata, (float32_t2)(glsl::gl_WorkGroupID() * glsl::gl_WorkGroupSize()), pushData.viewportSize);
+    uint32_t texWidth, texHeight;
+    texture.GetDimensions(texWidth, texHeight);
+    meter.sampleLuma(pushData.window, histo_accessor, tex, sdata, (float32_t2)(glsl::gl_WorkGroupID() * glsl::gl_WorkGroupSize()), float32_t2(texWidth, texHeight));
 }

26_Autoexposure/app_resources/median_luma_tonemap.comp.hlsl

@@ -75,7 +75,7 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     TexAccessor tex;
 
     using LumaMeter = luma_meter::median_meter< WorkgroupSize, BIN_COUNT, PtrAccessor, SharedAccessor, TexAccessor>;
-    LumaMeter meter = LumaMeter::create(pushData.lumaMinMax);
+    LumaMeter meter = LumaMeter::create(pushData.lumaMin, pushData.lumaMax, pushData.lowerBoundPercentile, pushData.upperBoundPercentile);
 
     float32_t EV = meter.gatherLuma(histo_accessor, sdata);
 

26_Autoexposure/main.cpp

@@ -41,12 +41,13 @@ class AutoexposureApp final : public SimpleWindowedApplication, public BuiltinRe
 		"app_resources/median_luma_tonemap.comp.hlsl",
 		"app_resources/present.frag.hlsl"
 	};
-	constexpr static inline MeteringMode MeterMode = MeteringMode::MEDIAN;
-	constexpr static inline uint32_t BinCount = 8000;	// TODO: it's 8000 here why? gonna set it to workgroup size (1024) for now
+	constexpr static inline MeteringMode MeterMode = MeteringMode::AVERAGE;
+	constexpr static inline uint32_t BinCount = 1024;
 	constexpr static inline uint32_t2 Dimensions = { 1280, 720 };
 	constexpr static inline float32_t2 MeteringWindowScale = { 0.8f, 0.8f };
 	constexpr static inline float32_t2 MeteringWindowOffset = { 0.1f, 0.1f };
-	constexpr static inline float32_t2 LumaMinMax = { 1.0f / 2048.0f, 65536.f };
+	constexpr static inline float32_t2 LumaRange = { 1.0f / 2048.0f, 65536.f };
+	constexpr static inline float32_t2 PercentileRange = { 0.45f, 0.55f };
 
 public:
 	// Yay thanks to multiple inheritance we cannot forward ctors anymore
@@ -768,10 +769,13 @@ class AutoexposureApp final : public SimpleWindowedApplication, public BuiltinRe
 		auto pc = AutoexposurePushData
 		{
 			.window = hlsl::luma_meter::MeteringWindow::create(MeteringWindowScale, MeteringWindowOffset),
-			.lumaMinMax = LumaMinMax,
-			.sampleCount = sampleCount,
+			.lumaMin = LumaRange.x,
+		    .lumaMax = LumaRange.y,
 			.viewportSize = Dimensions,
-			.lumaMeterBDA = (MeterMode == MeteringMode::AVERAGE) ? m_gatherBDA : m_histoBDA
+			.lumaMeterBDA = (MeterMode == MeteringMode::AVERAGE) ? m_gatherBDA : m_histoBDA,
+			.sampleCount = sampleCount,
+			.lowerBoundPercentile = PercentileRange.x,
+			.upperBoundPercentile = PercentileRange.y
 		};
 
 		// Luma Meter
@@ -786,6 +790,8 @@ class AutoexposureApp final : public SimpleWindowedApplication, public BuiltinRe
 				1 + ((gpuImgExtent.height / 2) - 1) / SubgroupSize
 			};
 
+			pc.rcpFirstPassWGCount = 1.f / float(dispatchSize.x * dispatchSize.y);
+
 			cmdbuf->begin(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT);
 			cmdbuf->bindComputePipeline(m_meterPipeline.get());
 			cmdbuf->bindDescriptorSets(nbl::asset::EPBP_COMPUTE, m_meterPipeline->getLayout(), 0, 1, &ds); // also if you created DS Set with 3th index you need to respect it here - firstSet tells you the index of set and count tells you what range from this index it should update, useful if you had 2 DS with lets say set index 2,3, then you can bind both with single call setting firstSet to 2, count to 2 and last argument would be pointet to your DS pointers