Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into release/2024.08-DeltaFPS

brad-linden · brad-linden · commit fc7082e93dde · 2024-08-22T14:06:07.000-07:00
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,9 @@ void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, ou`
`124`	`124`	`amblit = tmpAmbient;`
`125`	`125`
`126`	`126`	`additive *= vec3(1.0 - combined_haze);`
	`127`	`+`
	`128`	`+ // sanity clamp haze contribution`
	`129`	`+ additive = min(additive, vec3(10));`
`127`	`130`	`}`
`128`	`131`
`129`	`132`	`vec3 srgb_to_linear(vec3 col);`