summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-12-13 18:04:47 -0800
committerMerov Linden <merov@lindenlab.com>2012-12-13 18:04:47 -0800
commit94694be6b5aac985153aec8d396bfd47e7463acd (patch)
tree1350032c477613e20685ccd3401069b0a23e7010 /indra/newview/app_settings/shaders
parent569701cfc898091a414dad0650f89471b1962d49 (diff)
parent179ab5c7353150ebaeac6e32fa55f96670c3c256 (diff)
Pull merge from richard/viewer-chui
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;