fix(crimsondesert): auto exposure fixes

(cherry picked from commit 03a1b86)

Author: OopyDoopy

src/games/crimsondesert/postprocessing/AdaptExposure_0x65CFD284.cs_6_6.hlsl

@@ -385,8 +385,8 @@ void main(
           float _194 = _180 / _193;
           // When IMPROVED is on, override the game's per region and ToD controls
           // min/max luminance clamps with fixed values, I hope this solves double darkening
-          float _ae_min_lum = (IMPROVED_AUTO_EXPOSURE == 100) ? AE_MIN_LUM : _param1.z;
-          float _ae_max_lum = (IMPROVED_AUTO_EXPOSURE == 100) ? AE_MAX_LUM : _param1.w;
+          float _ae_min_lum = (IMPROVED_AUTO_EXPOSURE == 2) ? AE_MIN_LUM : _param1.z;
+          float _ae_max_lum = (IMPROVED_AUTO_EXPOSURE == 2) ? AE_MAX_LUM : _param1.w;
           float _195 = max(_194, _ae_min_lum);
           float _196 = min(_195, _ae_max_lum);
           float _197 = sqrt(_192);
@@ -564,7 +564,7 @@ void main(
             float _321 = saturate(_320);
             float _322 = _321 * _param3.z;
             // Sky visibility exposure bias
-            float _323 = (IMPROVED_AUTO_EXPOSURE == 100) ? 0.0f : (_322 + _param2.z);
+            float _323 = (IMPROVED_AUTO_EXPOSURE == 2) ? 0.0f : (_322 + _param2.z);
             float _324 = max(_smoothed_target_yf, 9.999999747378752e-05f);
             float _325 = min(_324, 7.0f);
             float _326 = _325 + -0.009999999776482582f;
@@ -587,7 +587,7 @@ void main(
             float _343 = _339 - _340;
             // Vanilla path (IMPROVED_AUTO_EXPOSURE == 0): keep this sky/occlusion-dependent
             // bias term active. Mode 2 zeros it and replaces it with explicit HDR shaping.
-            float _344 = (IMPROVED_AUTO_EXPOSURE == 100) ? 0.0f : (_343 * _342);
+            float _344 = (IMPROVED_AUTO_EXPOSURE == 2) ? 0.0f : (_343 * _342);
             float _345 = _smoothed_target_yf * 8.0f;
             float _346 = log2(_345);
             float _347 = _346 - _340;
@@ -598,7 +598,7 @@ void main(
 
             float _350;
             [branch]
-            if (IMPROVED_AUTO_EXPOSURE == 100) {
+            if (IMPROVED_AUTO_EXPOSURE == 2) {
               // --- HDR asymmetric exposure adaptation ---
               // We reduce vanilla's adaptation strength via a power curve
               // in log space, modulated by sky visibility and scene brightness.
@@ -629,7 +629,7 @@ void main(
             if (_353) {
               float _357 = __3__39__0__1__g_exposureUAV[1];
               [branch]
-              if (IMPROVED_AUTO_EXPOSURE == 100) {
+              if (IMPROVED_AUTO_EXPOSURE == 2) {
                 // Unified log space temporal adaptation becasue Vanilla uses two separate interpolation spaces (1/exp vs linear) 
                 // Causes visible jitter when the target oscillates around the previous value due to histogram noise. 
                 // Log space lerp is symmetric and smooth in both directions.
@@ -705,7 +705,7 @@ void main(
             } else {
               // Temporal reset (loading screens, menus)
               [branch]
-              if (IMPROVED_AUTO_EXPOSURE == 100) {
+              if (IMPROVED_AUTO_EXPOSURE == 2) {
                 // Preserve previous exposure to prevent spikes from garbage
                 // histogram data during transitions. Temporal adaptation will
                 // smoothly converge once gameplay resumes.
@@ -800,7 +800,7 @@ void main(
                   float _425 = _424 * _381;
                   _427 = _425;
                   // Apply EV bias for IMPROVED mode (compensates for zeroed _323 push constant correction)
-                  if (IMPROVED_AUTO_EXPOSURE == 100) {
+                  if (IMPROVED_AUTO_EXPOSURE == 2) {
                     _427 *= exp2(AE_EV_BIAS);
                   }
                 }
@@ -859,22 +859,22 @@ void main(
               // === RenoDX: Bloom/lens glare stabilisation ===
               // Write a low passed exposure into slot 18 (_exposure4.z).
               // Histogram-AWB and LensFlareComposite read this instead of the fast
-              // _exposure0.y when alt auto exposure is toggled.
-              // This stops vanilla exposure + glare feedback loop that causes bloom shimmer.
-              //
-              // Look into maybe doing a further filtering for distance objects?
+              // exposure state when smoothed AE or PsychoV17 is active.
+              // This stops the exposure + glare feedback loop that causes shimmer
+              // and makes foggy interiors flare unpredictably.
               [branch]
-              if (IMPROVED_AUTO_EXPOSURE == 1) {
+              if ((IMPROVED_AUTO_EXPOSURE == 1) || IMPROVED_AUTO_EXPOSURE == 2) {
                 float prevSlowExp = __3__39__0__1__g_exposureUAV[18];
                 float slowSeed = (prevSlowExp > 0.0001f && !isnan(prevSlowExp)) ? prevSlowExp : _427;
                 float slowTau = 0.05f;
                 float slowExp = lerp(slowSeed, _427, slowTau);
                 __3__39__0__1__g_exposureUAV[18] = slowExp;
                 // Slot 19: filtered target luminance for potential future use
+                float targetSource = IMPROVED_AUTO_EXPOSURE == 2 ? _psychov17_field_yf : _smoothed_target_yf;
                 float prevSlowTarget = __3__39__0__1__g_exposureUAV[19];
                 float targetSeed =
-                    (prevSlowTarget > 0.0001f && !isnan(prevSlowTarget)) ? prevSlowTarget : _smoothed_target_yf;
-                float slowTarget = lerp(targetSeed, _smoothed_target_yf, 0.08f);
+                    (prevSlowTarget > 0.0001f && !isnan(prevSlowTarget)) ? prevSlowTarget : targetSource;
+                float slowTarget = lerp(targetSeed, targetSource, 0.08f);
                 __3__39__0__1__g_exposureUAV[19] = slowTarget;
               }
 

src/games/crimsondesert/postprocessing/Histogram-AWB_0x05A8EA2B.cs_6_6.hlsl

@@ -377,8 +377,8 @@ void main(
   // RenoDX: When alt auto exposure is toggled, use the filtered exposure
   // from _exposure4.z (slot 18) instead of the fast _exposure0.y to decouple
   // glare intensity from jitter.
-  float _glareExposure = (IMPROVED_AUTO_EXPOSURE == 1) ? max(_exposure4.z, 0.001f) : _exposure0.y;
-  float _glareExposure2 = (IMPROVED_AUTO_EXPOSURE == 1) ? max(_exposure4.z, 0.001f) : _exposure2.x;
+  float _glareExposure = (IMPROVED_AUTO_EXPOSURE >= 1) ? max(_exposure4.z, 0.001f) : _exposure0.y;
+  float _glareExposure2 = (IMPROVED_AUTO_EXPOSURE >= 1) ? max(_exposure4.z, 0.001f) : _exposure2.x;
   if (_127) {
     float _236 = min(_glareExposure2, 2.0f);
     float _237 = max(_236, 0.5f);
@@ -748,7 +748,7 @@ void main(
   float _500 = _499 + _398;
   // RenoDX: Use slow exposure for glare instance threshold to
   // stop shimmering due to jitter
-  float _glareThresholdExp = (IMPROVED_AUTO_EXPOSURE == 1) ? max(_exposure4.z, 0.001f) : _exposure2.x;
+  float _glareThresholdExp = (IMPROVED_AUTO_EXPOSURE >= 1) ? max(_exposure4.z, 0.001f) : _exposure2.x;
   float _503 = saturate(_glareThresholdExp);
   float _504 = _503 * 900.0f;
   float _505 = _504 + 100.0f;