From 40799b97c188bb3c0a4b2d00a35bcc41be461f08 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 19 Dec 2022 15:27:43 -0600 Subject: SL-18779 Fix for water fog staying bright when sun is dark. --- indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings/shaders/class2/deferred') diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl index 25b0a0b970..076b976dc4 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl @@ -72,7 +72,7 @@ uniform vec3 light_diffuse[8]; void waterClip(vec3 pos); #ifdef WATER_FOG -vec4 applyWaterFogViewLinear(vec3 pos, vec4 color); +vec4 applyWaterFogViewLinear(vec3 pos, vec4 color, vec3 sunlit); #endif vec3 srgb_to_linear(vec3 c); @@ -226,7 +226,7 @@ void main() vec4 diffuse_linear = vec4(srgb_to_linear(diffuse_srgb.rgb), diffuse_srgb.a); - vec3 light_dir = (sun_up_factor == 1) ? sun_dir: moon_dir; + vec3 light_dir = (sun_up_factor == 1) ? sun_dir: moon_dir; // TODO -- factor out "sun_up_factor" and just send in the appropriate light vector float final_alpha = diffuse_linear.a; @@ -295,7 +295,7 @@ void main() #endif // !defined(LOCAL_LIGHT_KILL) #ifdef WATER_FOG - color = applyWaterFogViewLinear(pos.xyz, color); + color = applyWaterFogViewLinear(pos.xyz, color, sunlit); #endif // WATER_FOG #endif // #else // FOR_IMPOSTOR -- cgit v1.2.3