summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-08-22 14:06:07 -0700
committerBrad Linden <brad@lindenlab.com>2024-08-22 14:06:07 -0700
commitfc7082e93dde7ea122e7f0782f66e0aeb530596f (patch)
tree83ba0ee2b600fc99085b7f72fd6c9d6190a7fa67 /indra/newview/app_settings
parentc2402afd8b681879bdc5fe563364f5842da31992 (diff)
parent25c4ba3a76c3dd81bb9554abf27ab3cbe5dcd95d (diff)
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into release/2024.08-DeltaFPS
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 55daa83750..359bfe8253 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -124,6 +124,9 @@ void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, ou
amblit = tmpAmbient;
additive *= vec3(1.0 - combined_haze);
+
+ // sanity clamp haze contribution
+ additive = min(additive, vec3(10));
}
vec3 srgb_to_linear(vec3 col);