diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-12-13 14:47:40 -0600 | 
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-12-13 14:47:40 -0600 | 
| commit | fefdd5aef92e0ba7f37147d7ba057b3b0459c4bf (patch) | |
| tree | 7151d4fb959a83f0540deaf1deb3a5e7c40bd8f8 /indra/newview/app_settings/shaders | |
| parent | 60196f6ab3697c5b6cff6b2c856449d94d56ddee (diff) | |
SL-20730 Scrub nans from haze alpha
Diffstat (limited to 'indra/newview/app_settings/shaders')
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/hazeF.glsl | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/waterHazeF.glsl | 4 | 
2 files changed, 4 insertions, 4 deletions
| diff --git a/indra/newview/app_settings/shaders/class3/deferred/hazeF.glsl b/indra/newview/app_settings/shaders/class3/deferred/hazeF.glsl index e8f7d73f1f..229f332b36 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/hazeF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/hazeF.glsl @@ -102,6 +102,6 @@ void main()          alpha = 1.0;      } -    frag_color.rgb = max(color.rgb, vec3(0)); //output linear since local lights will be added to this shader's results -    frag_color.a = alpha; +    frag_color = max(vec4(color.rgb, alpha), vec4(0)); //output linear since local lights will be added to this shader's results +      } diff --git a/indra/newview/app_settings/shaders/class3/deferred/waterHazeF.glsl b/indra/newview/app_settings/shaders/class3/deferred/waterHazeF.glsl index 13619a82d3..f6b8299f91 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/waterHazeF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/waterHazeF.glsl @@ -60,6 +60,6 @@ void main()      vec4 fogged = getWaterFogView(pos.xyz); -    frag_color.rgb = max(fogged.rgb, vec3(0)); //output linear since local lights will be added to this shader's results -    frag_color.a = fogged.a; +    frag_color = max(fogged, vec4(0)); //output linear since local lights will be added to this shader's results +      } | 
