summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-12-12 12:48:59 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-12-12 12:48:59 -0800
commit78b7a4b37c4762ea9503c1da0f79ab8fc412c2b9 (patch)
treeb252cc03e1cbee6e705b3339c61fa8979a9cadf7 /indra/newview/app_settings/shaders
parent3d7aaaada853d950888a2fd0fe3e2f375bd5bbb0 (diff)
parenta334f41f8ebec5ef812334e5086e54256e2bf7df (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
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;