summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-26 16:12:33 -0400
committerOz Linden <oz@lindenlab.com>2012-05-26 16:12:33 -0400
commitdbac37dcb50bf44255c2b622d418bb4339f1afca (patch)
treeacffbcb5984696e507243f939f6b9c5a951b755b /indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
parent790dfda43472da75d17a848eb91e2dcecb2b96e7 (diff)
parentb2b446aed7f7f32151bc152ba25d44253ebf864f (diff)
merge latest viewer-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
index 31bd0c79da..99a277fbfc 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
@@ -26,7 +26,9 @@
#extension GL_ARB_texture_rectangle : enable
#ifdef DEFINE_GL_FRAGCOLOR
-out vec4 gl_FragColor;
+out vec4 frag_color;
+#else
+#define frag_color gl_FragColor
#endif
VARYING vec4 vertex_color;
@@ -201,6 +203,6 @@ void main()
}
}
- gl_FragColor.rgb = col;
- gl_FragColor.a = 0.0;
+ frag_color.rgb = col;
+ frag_color.a = 0.0;
}