diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
commit | a4913246770b58ed569021c484c213231aaae549 (patch) | |
tree | 0878deeaa86b2c3a28cbf325566e8489111523c1 /indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl | |
parent | 80c2abddcfbcb578e70d220baa95aebdee3d529c (diff) | |
parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) |
merge up to latest viewer-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl index bf75ca262e..7e55fdc12a 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl @@ -24,14 +24,16 @@ */ #ifdef DEFINE_GL_FRAGCOLOR -out vec4 gl_FragColor; +out vec4 frag_color; +#else +#define frag_color gl_FragColor #endif VARYING vec4 post_pos; void main() { - gl_FragColor = vec4(1,1,1,1); + frag_color = vec4(1,1,1,1); gl_FragDepth = max(post_pos.z/post_pos.w*0.5+0.5, 0.0); } |