diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-19 17:39:56 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-19 17:39:56 -0700 |
| commit | d3e954cfaca067adf60f2e3c161028c6549263e4 (patch) | |
| tree | 54826d4b8ff8fa7683770876bb654c3afdaaf076 /indra/newview/app_settings/shaders/class1/interface | |
| parent | 79836e32d575248642cfd6af837548aac054988f (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Merge 3.6.6 Materials RC and update Intel HD gpu_table entries to expect GL 4.2 to nag resis to get the fixed Intel driver
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; |