check range on tonemap output

Author: keptsecret

26_Autoexposure/app_resources/avg_luma_tonemap.comp.hlsl

@@ -86,6 +86,11 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     uint32_t2 coord = _static_cast<uint32_t2>(mc);
 
     uint32_t2 pos = (glsl::gl_WorkGroupID() * glsl::gl_WorkGroupSize()).xy + coord;
+    uint32_t texWidth, texHeight;
+    textureOut.GetDimensions(texWidth, texHeight);
+    if (any(pos < promote<uint32_t2>(0u)) || any(pos > uint32_t2(texWidth, texHeight)))
+        return;
+
     float32_t2 uv = (float32_t2)(pos) / pushData.viewportSize;
     float32_t3 color = colorspace::eotf::sRGB(tex.get(uv).rgb);
     float32_t3 CIEColor = mul(colorspace::sRGBtoXYZ, color);

26_Autoexposure/app_resources/median_luma_tonemap.comp.hlsl

@@ -92,6 +92,11 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     uint32_t2 coord = _static_cast<uint32_t2>(mc);
 
     uint32_t2 pos = (glsl::gl_WorkGroupID() * glsl::gl_WorkGroupSize()).xy + coord;
+    uint32_t texWidth, texHeight;
+    textureOut.GetDimensions(texWidth, texHeight);
+    if (any(pos < promote<uint32_t2>(0u)) || any(pos > uint32_t2(texWidth, texHeight)))
+        return;
+
     float32_t2 uv = (float32_t2)(pos) / pushData.viewportSize;
     float32_t3 color = colorspace::eotf::sRGB(tex.get(uv).rgb);
     float32_t3 CIEColor = mul(colorspace::sRGBtoXYZ, color);

26_Autoexposure/main.cpp

@@ -42,7 +42,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::MEDIAN;
+	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 MeteringMinUV = { 0.1f, 0.1f };