summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-06-08 18:58:35 -0700
committerMerov Linden <merov@lindenlab.com>2012-06-08 18:58:35 -0700
commit1bfdfcb7b9dd392459b012b0712237716c94a84c (patch)
treebdc4dfb4ef49c209acbdc3e9dd633a5a8a29dbba /indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl
parentab954444154de43ee18575a3b0649d0f3045dfd8 (diff)
parentdab5ef9d881bc41bc4924102c939db25dd26e0d9 (diff)
Merge pull from vir/drano
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl
index 10413bdeb0..cf29939cb2 100644
--- a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl
+++ b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskF.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;
@@ -48,6 +50,6 @@ void default_lighting()
color.rgb = scaleSoftClip(color.rgb);
- gl_FragColor = color;
+ frag_color = color;
}