diff options
author | dolphin <dolphin@lindenlab.com> | 2013-09-18 15:58:54 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-09-18 15:58:54 -0700 |
commit | d9ad2d3a13b4bb15ab5e56fd04970abc03e100e7 (patch) | |
tree | 39178dd2b0ab11d754b57b492b4835b926a538c6 /indra/newview/app_settings/shaders/class1/interface | |
parent | c8144f7405178621f779b814fd4cb3e632786e0a (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
Merge with 3.6.6-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/downsampleDepthF.glsl | 2 | ||||
-rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/downsampleDepthF.glsl b/indra/newview/app_settings/shaders/class1/interface/downsampleDepthF.glsl index 6523a06d22..f8efd7cb4a 100644 --- a/indra/newview/app_settings/shaders/class1/interface/downsampleDepthF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/downsampleDepthF.glsl @@ -31,8 +31,6 @@ out vec4 frag_color; uniform sampler2D depthMap; -uniform float delta; - VARYING vec2 tc0; VARYING vec2 tc1; VARYING vec2 tc2; diff --git a/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl b/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl index 0e5dc08183..942c5888e7 100644 --- a/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl @@ -33,8 +33,6 @@ out vec4 frag_color; uniform sampler2DRect depthMap; -uniform float delta; - VARYING vec2 tc0; VARYING vec2 tc1; VARYING vec2 tc2; |