From cc6d132e90921c7006253f6fba149d22f2cabd39 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Fri, 29 Jan 2021 14:32:37 -0800
Subject: [PATCH] SL-14732: Merge Sovereign Engineer's cloud patch: Fix writing
outside outside of the bound fbo in forward render class2 cloud shader
---
doc/contributions.txt | 1 +
.../app_settings/shaders/class2/windlight/cloudsF.glsl | 8 +++-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2f506e16ae4..b5e8e912792 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1357,6 +1357,7 @@ Sovereign Engineer
SL-14705
SL-14707
SL-14731
+ SL-14732
SpacedOut Frye
VWR-34
VWR-45
diff --git a/indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl
index 75bf8730df4..fa928d993ef 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl
@@ -26,9 +26,9 @@
/*[EXTRA_CODE_HERE]*/
#ifdef DEFINE_GL_FRAGCOLOR
-out vec4 frag_data[3];
+out vec4 frag_color;
#else
-#define frag_data gl_FragData
+#define frag_color gl_FragColor
#endif
/////////////////////////////////////////////////////////////////////////
@@ -126,8 +126,6 @@ void main()
color.rgb = scaleSoftClip(color.rgb);
/// Gamma correct for WL (soft clip effect).
- frag_data[0] = vec4(color.rgb, alpha1);
- frag_data[1] = vec4(0.0,0.0,0.0,0.0);
- frag_data[2] = vec4(0,0,0,1);
+ frag_color = vec4(color.rgb, alpha1);
}
--
GitLab