diff options
author | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:24:08 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:24:08 -0500 |
commit | 623a06aabd9d7e5c7e74211360aa233ec33e4977 (patch) | |
tree | 21c815db542e45fc07473cd26a24561c5f27add8 /indra/newview/app_settings/shaders/class1/deferred | |
parent | d56a98dea4c7523a759bea4740d8bdde1df15e30 (diff) | |
parent | a9ada0cc6a1418da0908f995b1369912a270b22d (diff) |
merge release tag
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
-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; |