diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-12-05 09:36:38 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-12-05 09:36:38 -0500 |
commit | 5a938e3a1c8582d6bfe6df2aa195afcdcafb355a (patch) | |
tree | 2206c0edf6cfadce17d5cc294b482e5fab043a46 /indra/newview/app_settings/shaders/class1 | |
parent | b078a515e197473dbab34724263348dd88030b4d (diff) | |
parent | e6712cab31df0e1d766a4d935bada18d57cd26ad (diff) |
merge changes for DRTVWR-254
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; |