summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-08-23 10:16:42 +0800
committerErik Kundiman <erik@megapahit.org>2024-08-23 10:16:42 +0800
commita9113d199645fcd3db46e120c0d9e86fb3f1ce93 (patch)
tree1a8b156d7e8f4830804b9600e5ab3e731b1ab872 /indra/newview/app_settings
parent60f0e2894f311d310273aef6dc9743bec2fb7308 (diff)
parent25c4ba3a76c3dd81bb9554abf27ab3cbe5dcd95d (diff)
Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus
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 38fdd379ea..af10ecce9a 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);