diff options
author | simon_linden <none@none> | 2013-09-19 15:30:34 -0700 |
---|---|---|
committer | simon_linden <none@none> | 2013-09-19 15:30:34 -0700 |
commit | d3625d0b672d59b0164e1b4615edbb9550912ec6 (patch) | |
tree | 292f86a4e1dc65d57faee094f5365bf72a240846 /indra/newview/app_settings/shaders/class1/interface | |
parent | 8fa463113c19682a64988d2f8c527ef5e5dd156c (diff) | |
parent | 95e34d86b9d86b3b3c7d3c39620e35b06f8fa9cf (diff) |
Merge downstream code
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; |