diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-12 17:00:35 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-12 17:00:35 -0800 |
| commit | 2a9056f0b74ad8dc3051488688e150a85cb0afdc (patch) | |
| tree | bca1d33e78b98cf5ef6fac7e7b9c3dffa3a7af39 /indra/newview/app_settings/shaders/class1 | |
| parent | 89671fa1ad4ef13acb264d0e047fb24b9ee5d8a4 (diff) | |
| parent | a88de5d45fe698bf9193659a677927c96c319ad6 (diff) | |
merging in latest changes
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; |