summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-12-11 17:04:23 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-12-11 17:04:23 -0800
commit74d3dc41fb7e24410ba052a9c5ce2867fbdb9c0a (patch)
treecde4b149fe66bbc08bfcd4c1e2f572f5402fc8c6 /indra/newview/app_settings/shaders
parent44abb8c3bf4ae3edc871583bd1fa19f10c72fdf1 (diff)
parentedcdce226a7ff599e43c89fe7e4d37350650ae96 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/app_settings/shaders')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
index e02a7b405b..2cef8f2a5d 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
@@ -2093,7 +2093,6 @@ uniform sampler2D diffuseMap;
uniform vec2 rcp_screen_res;
uniform vec4 rcp_frame_opt;
uniform vec4 rcp_frame_opt2;
-uniform vec2 screen_res;
VARYING vec2 vary_fragcoord;
VARYING vec2 vary_tc;