summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred/treeShadowF.glsl
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-04-03 11:06:33 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-04-03 11:06:33 -0700
commit36a0a58487063152d8aacdeb22060025fe0021c7 (patch)
tree58a59dee2b88e1e51391987b157a37b3c8cd710b /indra/newview/app_settings/shaders/class1/deferred/treeShadowF.glsl
parent8b5b0ace9bfb83540fbc73376b639180d6d63a3b (diff)
parentfa6add3fcd300b21142e3381f35851b3404ee02a (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/treeShadowF.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/treeShadowF.glsl6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/treeShadowF.glsl b/indra/newview/app_settings/shaders/class1/deferred/treeShadowF.glsl
index 20d0170535..d4d2f5f571 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/treeShadowF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/treeShadowF.glsl
@@ -24,7 +24,9 @@
*/
#ifdef DEFINE_GL_FRAGCOLOR
-out vec4 gl_FragColor;
+out vec4 frag_color;
+#else
+#define frag_color gl_FragColor
#endif
uniform float minimum_alpha;
@@ -43,7 +45,7 @@ void main()
discard;
}
- 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);
}