diff options
author | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:04:11 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-06-14 23:04:11 -0500 |
commit | 37a8c12bd34b2bd119b50f32d6e081ab59d1f5c4 (patch) | |
tree | ccdc7a5952a55dab7417251b248a25f6ca6fd530 /indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl | |
parent | b3fc9c79f559c84893dede3ce643ac0dfd1f3d65 (diff) | |
parent | ad5a45624a702433d481c3dbc0f348a8755b367c (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl index ad16de6d81..fa6b4e2afb 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl @@ -29,8 +29,6 @@ varying vec3 vary_fragcoord; varying vec3 vary_position; varying vec3 vary_light; -uniform float alpha_soften; - uniform float shadow_bias; uniform mat4 inv_proj; @@ -115,18 +113,9 @@ void main() color.rgb = scaleSoftClip(color.rgb); - if (samp_pos.z != 0.0 && gl_Color.a < 1.0) - { - float dist_factor = alpha_soften; - float a = gl_Color.a; - a *= a; - dist_factor *= 1.0/(1.0-a); - color.a *= min((pos.z-samp_pos.z)*dist_factor, 1.0); - } - //gl_FragColor = gl_Color; gl_FragColor = color; - //gl_FragColor = vec4(1,0,1,1)*shadow; + //gl_FragColor = vec4(1,shadow,1,1); } |