fixes histogram autoexposure

Author: keptsecret

26_Autoexposure/app_resources/median_luma_meter.comp.hlsl

@@ -16,7 +16,9 @@ using PtrAccessor = BdaAccessor < uint32_t >;
 
 [[vk::push_constant]] AutoexposurePushData pushData;
 
-groupshared uint32_t sdata[WorkgroupSize];
+#define BIN_COUNT 1024
+
+groupshared uint32_t sdata[BIN_COUNT];
 struct SharedAccessor
 {
     using type = uint32_t;
@@ -43,7 +45,7 @@ struct SharedAccessor
 struct TexAccessor
 {
     static float32_t3 toXYZ(float32_t3 srgbColor) {
-        return mul(colorspace::sRGBtoXYZ, srgbColor);
+        return dot(colorspace::sRGBtoXYZ[1], srgbColor);
     }
 
     float32_t3 get(float32_t2 uv) {
@@ -66,7 +68,7 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     SharedAccessor sdata;
     TexAccessor tex;
 
-    using LumaMeter = luma_meter::median_meter< WorkgroupSize, 8000, PtrAccessor, SharedAccessor, TexAccessor>;
+    using LumaMeter = luma_meter::median_meter< WorkgroupSize, BIN_COUNT, PtrAccessor, SharedAccessor, TexAccessor>;
     LumaMeter meter = LumaMeter::create(pushData.lumaMinMax);
 
     meter.sampleLuma(pushData.window, histo_accessor, tex, sdata, (float32_t2)(glsl::gl_WorkGroupID() * glsl::gl_WorkGroupSize()), pushData.viewportSize);

26_Autoexposure/app_resources/median_luma_tonemap.comp.hlsl

@@ -21,7 +21,9 @@ using PtrAccessor = BdaAccessor < uint32_t >;
 
 [[vk::push_constant]] AutoexposurePushData pushData;
 
-groupshared uint32_t sdata[WorkgroupSize];
+#define BIN_COUNT 1024
+
+groupshared uint32_t sdata[BIN_COUNT];
 struct SharedAccessor
 {
     using type = uint32_t;
@@ -72,7 +74,7 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     SharedAccessor sdata;
     TexAccessor tex;
 
-    using LumaMeter = luma_meter::median_meter< WorkgroupSize, 8000, PtrAccessor, SharedAccessor, TexAccessor>;
+    using LumaMeter = luma_meter::median_meter< WorkgroupSize, BIN_COUNT, PtrAccessor, SharedAccessor, TexAccessor>;
     LumaMeter meter = LumaMeter::create(pushData.lumaMinMax);
 
     float32_t EV = meter.gatherLuma(histo_accessor, sdata);
@@ -84,10 +86,10 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
 
     uint32_t2 pos = (glsl::gl_WorkGroupID() * glsl::gl_WorkGroupSize()).xy + coord;
     float32_t2 uv = (float32_t2)(pos) / pushData.viewportSize;
-    float32_t3 color = colorspace::oetf::sRGB(tex.get(uv).rgb);
+    float32_t3 color = colorspace::eotf::sRGB(tex.get(uv).rgb);
     float32_t3 CIEColor = mul(colorspace::sRGBtoXYZ, color);
     tonemapper::Reinhard<float32_t> reinhard = tonemapper::Reinhard<float32_t>::create(EV, 0.18, 0.85f);
     float32_t3 tonemappedColor = mul(colorspace::decode::XYZtoscRGB, reinhard(CIEColor));
 
-    textureOut[pos] = float32_t4(tonemappedColor, 1.0f);
+    textureOut[pos] = float32_t4(colorspace::oetf::sRGB(tonemappedColor), 1.0f);
 }

26_Autoexposure/main.cpp

@@ -41,7 +41,7 @@ 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::AVERAGE;
+	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 uint32_t2 Dimensions = { 1280, 720 };
 	constexpr static inline float32_t2 MeteringWindowScale = { 0.8f, 0.8f };