diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2021-01-29 14:32:37 -0800 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2021-01-29 14:32:37 -0800 |
| commit | cc6d132e90921c7006253f6fba149d22f2cabd39 (patch) | |
| tree | 22855c9efa05b3dea372799024332bba881604b5 | |
| parent | d7b2016e39cb298a0a105e624ecc7bcf9d7db187 (diff) | |
SL-14732: Merge Sovereign Engineer's cloud patch: Fix writing outside outside of the bound fbo in forward render class2 cloud shader
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/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 2f506e16ae..b5e8e91279 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 75bf8730df..fa928d993e 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); } |