Update Settings and Perceptual AE

Author: clshortfuse

src/games/crimsondesert/addon.cpp

@@ -3,7 +3,6 @@
 #include "./psycho_test17_custom.hlsl"
 #include "./shared.h"
 
-
 float NR(float x, float sigma, float n) {
   float ax = abs(x);
   float xn = pow(max(ax, 0.0f), n);
@@ -221,34 +220,39 @@ float3 CustomPsychoV17Peak(
     float peak_value,
     float mid_gray_scale = 1.f,
     int gamut_compression_mode = 1) {
-  bool valid_current_average = (current_average > 0.0f) && !isnan(current_average) && !isinf(current_average);
-  bool valid_target_average = (target_average > 0.0f) && !isnan(target_average) && !isinf(target_average);
-
-  if (!valid_target_average) {
-    return 0.0f.xxx;
+  if (!(target_average > 0.0f)) {
+    return 0.0f;
   }
 
-  if (!valid_current_average) {
+  if (!(current_average > 0.0f)) {
     current_average = target_average;
   }
 
   float3 bt709_scene = untonemapped_bt709 * RENODX_TONE_MAP_EXPOSURE;
-  bool has_valid_anchor = valid_current_average && valid_target_average;
-  float boosted = has_valid_anchor ? (target_average / current_average) : 1.0f;
-  if (has_valid_anchor) {
-    bt709_scene *= boosted;
+
+  if (target_average >= peak_value) {
+    return min(bt709_scene, peak_value);
   }
 
+  float boost = 1.f;
+  if (!(current_average > 0.0f)) {
+    current_average = target_average;
+  } else {
+    boost = renodx::math::DivideSafe(target_average, current_average, 1.0f);
+  }
+
+  bt709_scene *= boost;
+
   float3 lms_in = renodx::color::lms::from::BT709(bt709_scene);
   float yf_input = renodx::color::yf::from::LMS(lms_in);
   float yf_midgray = renodx::color::yf::from::BT709(0.18f);
   float yf_target = yf_input;
 
   if (RENODX_TONE_MAP_HIGHLIGHTS != 1.f) {
-    yf_target = renodx::color::grade::Highlights(yf_target, RENODX_TONE_MAP_HIGHLIGHTS, yf_midgray, 1.f);
+    yf_target = renodx::color::grade::Highlights(yf_target, RENODX_TONE_MAP_HIGHLIGHTS, yf_midgray);
   }
   if (RENODX_TONE_MAP_SHADOWS != 1.f) {
-    yf_target = renodx::color::grade::Shadows(yf_target, RENODX_TONE_MAP_SHADOWS, yf_midgray, 1.f);
+    yf_target = renodx::color::grade::Shadows(yf_target, RENODX_TONE_MAP_SHADOWS, yf_midgray);
   }
   if (RENODX_TONE_MAP_CONTRAST != 1.f) {
     yf_target = renodx::color::grade::ContrastSafe(yf_target, RENODX_TONE_MAP_CONTRAST, yf_midgray);
@@ -257,15 +261,10 @@ float3 CustomPsychoV17Peak(
 
   float yf_scale = renodx::math::DivideSafe(yf_target, yf_input, 1.f);
   bt709_scene *= yf_scale;
-  if (has_valid_anchor) {
-    bt709_scene /= boosted;
-  }
 
-  if (target_average >= peak_value) {
-    return min(bt709_scene, peak_value.xxx);
-  }
+  bt709_scene /= boost;
 
-  float anchor_in = has_valid_anchor ? current_average : target_average;
+  float anchor_in = current_average;
   float anchor_out = target_average;
 
   return renodx::tonemap::psycho::psychotm_test17(
@@ -288,7 +287,7 @@ float3 CustomPsychoV17Peak(
       gamut_compression_mode);
 }
 
-float3 CustomPsychoV17AutoExposure(float3 untonemapped_bt709, float peak, float mid_gray_scale,float current_average, float target_average, bool is_sdr = false) {
+float3 CustomPsychoV17AutoExposure(float3 untonemapped_bt709, float peak, float mid_gray_scale, float current_average, float target_average, bool is_sdr = false) {
   return CustomPsychoV17Peak(
       untonemapped_bt709,
       current_average,
@@ -299,24 +298,19 @@ float3 CustomPsychoV17AutoExposure(float3 untonemapped_bt709, float peak, float
 }
 
 float3 ProcessTonemap(float3 untonemapped_bt709, float calculated_peak, float mid_gray_scale, float current_average, float target_average, bool is_sdr = false) {
-  const float white_clip = 100.f;
-  const int white_curve_mode = 1;
+  if (RENODX_TONE_MAP_TYPE == 0.f) {
+    return untonemapped_bt709;
+  }
 
   mid_gray_scale = lerp(1.f, mid_gray_scale, CUSTOM_TONE_MAP_MIDGRAY_ADJUST);
 
-  float3 output_color = untonemapped_bt709;
-  if (RENODX_TONE_MAP_TYPE == 1.f) {
-
-    output_color = CustomPsychoV17AutoExposure(
-        output_color,
-        calculated_peak,
-        mid_gray_scale,
-        current_average,
-        target_average,
-        is_sdr);
-
-  }
-  return output_color;
+  return CustomPsychoV17AutoExposure(
+      untonemapped_bt709,
+      calculated_peak,
+      mid_gray_scale,
+      current_average,
+      target_average,
+      is_sdr);
 }
 
 float3 CustomTonemap(float3 untonemapped_bt709, float mid_gray_scale = 1.f, float current_average = 0.18f, float target_average = 0.18f) {
@@ -335,7 +329,7 @@ float3 CustomTonemap(float3 untonemapped_bt709, float mid_gray_scale = 1.f, floa
   return output_color;
 }
 
-float3 CustomTonemapSDR(float3 untonemapped_bt709, float mid_gray_scale, float current_average, float target_average) {
+float3 CustomTonemapSDR(float3 untonemapped_bt709, float mid_gray_scale, float current_average = 0.18f, float target_average = 0.18f) {
   float calculated_peak = 1.f;
   calculated_peak = CUSTOM_SDR_BLACK_CRUSH_FIX == 1 ? renodx::color::correct::GammaSafe(calculated_peak) : calculated_peak;
 

src/games/crimsondesert/common.hlsl

@@ -9,9 +9,9 @@ cbuffer __3__35__0__0__ExposureConstantBuffer : register(b31, space35) {
 // AE2 fields used by the grading path:
 //   _exposure0.x = final adapted exposure scalar written by AdaptExposure
 //   _exposure2.x = raw meter / histogram luminance
-//   _exposure2.y = fast equivalent-background carryover
+//   _exposure2.y = signed fast-direction settling delta from the clean field
 //   _exposure2.z = clean adapted field ("Adapt" in the debug panel)
-//   _exposure2.w = slow equivalent-background carryover
+//   _exposure2.w = signed slow-direction settling delta from the clean field
 //   _exposure4.z = filtered exposure history used by glare/lens effects
 
 cbuffer __3__1__0__0__GlobalPushConstants : register(b0, space1) {
@@ -32,39 +32,20 @@ cbuffer __3__1__0__0__GlobalPushConstants : register(b0, space1) {
 // _userImageAdjust.z is the grading exposure multiplier
 // ("ColorGradeExposure" in the addon UI). It sits on top of the AE solve.
 
-bool IsFinitePositiveYf(float value) {
-  return (value > 0.0f) && !isnan(value) && !isinf(value);
-}
-
-float SanitizePerceptualYf(float value) {
-  return clamp(value, 9.999999974752427e-07f, 65536.0f);
-}
 
 float GetPerceptualAdaptedFieldYf() {
   // Prefer the clean adapted field, then fall back to the raw meter when
   // history is invalid (first frame / load / reset).
-  float field_state = IsFinitePositiveYf(_exposure2.z) ? SanitizePerceptualYf(_exposure2.z) :
-      (IsFinitePositiveYf(_exposure2.x) ? SanitizePerceptualYf(_exposure2.x) : 0.18f);
+  float field_state = _exposure2.z;
 
-  // Carryover terms preserve short/long dark adaptation memory after bright
-  // scenes and are added back to the clean field to form the current anchor.
+  // AE2 exposes the live adaptation anchor as the clean field plus signed
+  // settling deltas. Negative FastBg means the observer is still catching up
+  // to a brighter field; positive SlowBg means the observer is still carrying
+  // a brighter past state into a darker field.
   float fast_equivalent_background = _exposure2.y;
   float slow_equivalent_background = _exposure2.w;
-  bool fast_valid = IsFinitePositiveYf(fast_equivalent_background);
-  bool slow_valid = IsFinitePositiveYf(slow_equivalent_background);
-
-  if (fast_valid) {
-    fast_equivalent_background = SanitizePerceptualYf(fast_equivalent_background);
-  } else {
-    fast_equivalent_background = 0.0f;
-  }
-  if (slow_valid) {
-    slow_equivalent_background = SanitizePerceptualYf(slow_equivalent_background);
-  } else {
-    slow_equivalent_background = 0.0f;
-  }
 
-  return SanitizePerceptualYf(field_state + fast_equivalent_background + slow_equivalent_background);
+  return field_state + fast_equivalent_background + slow_equivalent_background;
 }
 
 // // Core SDR curve stage only. Expects per-channel linear inputs and outputs in the same space.