diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-17 13:47:31 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-17 13:47:31 -0700 |
| commit | 19e0cc93a8af661dbac47552474a704ade600c74 (patch) | |
| tree | 5d7e539a4c98607a189c6e472732b75608379abb /indra/newview/app_settings/shaders/class2/windlight | |
| parent | ee1124e1c02b1a8be0cc8d2cbce1083dca3b40a2 (diff) | |
| parent | 3ccda1f2855ae9e5b3f519236e9b4f233d542d1a (diff) | |
DRTVWR-139: merge back 3.3.1-beta2 fixes
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/windlight')
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl | 8 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/windlight/skyF.glsl | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl index 4ab06c6e21..96c70651b1 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/cloudsF.glsl @@ -24,7 +24,9 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif ///////////////////////////////////////////////////////////////////////// @@ -96,7 +98,7 @@ void main() color *= 2.; /// Gamma correct for WL (soft clip effect). - gl_FragColor.rgb = scaleSoftClip(color.rgb); - gl_FragColor.a = alpha1; + frag_color.rgb = scaleSoftClip(color.rgb); + frag_color.a = alpha1; } diff --git a/indra/newview/app_settings/shaders/class2/windlight/skyF.glsl b/indra/newview/app_settings/shaders/class2/windlight/skyF.glsl index c9d96b2cf4..e2a2367626 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/skyF.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/skyF.glsl @@ -24,7 +24,9 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif ///////////////////////////////////////////////////////////////////////// @@ -57,7 +59,7 @@ void main() color *= 2.; /// Gamma correct for WL (soft clip effect). - gl_FragColor.rgb = scaleSoftClip(color.rgb); - gl_FragColor.a = 1.0; + frag_color.rgb = scaleSoftClip(color.rgb); + frag_color.a = 1.0; } |