From fefdd5aef92e0ba7f37147d7ba057b3b0459c4bf Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 13 Dec 2023 14:47:40 -0600
Subject: [PATCH] SL-20730 Scrub nans from haze alpha
---
indra/newview/app_settings/shaders/class3/deferred/hazeF.glsl | 4 ++--
.../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 e8f7d73f1fe..229f332b36e 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 13619a82d30..f6b8299f914 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
+
}
--
GitLab