summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-10-25 14:39:05 -0500
committerDave Parks <davep@lindenlab.com>2011-10-25 14:39:05 -0500
commit30d1a2d053fe7d6e0c88928cf51aa73865ee21e8 (patch)
tree1a878cdf561ed5e2f4ce0edca2986239b9724b18 /indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
parentb7a349f231977d5917b29faacca143a85d925576 (diff)
parentc54f6cfdc3f44ccb6fee3acd5fa40bd177c67639 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
index 29f5f899ba..985f44fb6c 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
@@ -22,11 +22,13 @@
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
-
-
#extension GL_ARB_texture_rectangle : enable
+#ifdef DEFINE_GL_FRAGCOLOR
+out vec4 gl_FragColor;
+#endif
+
uniform sampler2DRect diffuseRect;
uniform sampler2DRect edgeMap;
uniform sampler2DRect depthMap;
@@ -43,7 +45,7 @@ uniform float magnification;
uniform mat4 inv_proj;
uniform vec2 screen_res;
-varying vec2 vary_fragcoord;
+VARYING vec2 vary_fragcoord;
float getDepth(vec2 pos_screen)
{