diff options
author | Logan Dethrow <log@lindenlab.com> | 2012-12-11 17:14:24 -0500 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2012-12-11 17:14:24 -0500 |
commit | 2807c0b9424f9d3f80e49a3c150af0a459676d79 (patch) | |
tree | 2fdf21ef5429e112cc767bf3f594c8fe5c3d950b /indra/newview/app_settings/shaders/class1 | |
parent | 5798dd54ccbf2728725eae397a235c89d111cf93 (diff) | |
parent | 03025733484f7f1ea46d0356e65b0d142bc1dbdb (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internal
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl | 1 |
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; |