summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-05-30 14:44:39 -0500
committerDave Parks <davep@lindenlab.com>2012-05-30 14:44:39 -0500
commit2207b979ebb4f453fdda721710a7cc1b71df55b2 (patch)
tree2852bd0c26b04d486545ef8309cd7956926d9463 /indra/newview/app_settings/shaders/class1
parent2e26dc3971f80fb177c53bc20c06798bbe4391a6 (diff)
MAINT-622 Fix for broken alpha masking on avatar clothing when Lighting and Shadows enabled.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl
index cb87b754b4..1113a9845b 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl
@@ -31,6 +31,8 @@ out vec4 frag_color;
#define frag_color gl_FragColor
#endif
+uniform float minimum_alpha;
+
uniform sampler2DRect depthMap;
uniform sampler2D diffuseMap;
@@ -70,9 +72,15 @@ void main()
vec4 diff= texture2D(diffuseMap,vary_texcoord0.xy);
+ if (diff.a < minimum_alpha)
+ {
+ discard;
+ }
+
vec4 col = vec4(vary_ambient + vary_directional.rgb, 1.0);
vec4 color = diff * col;
+
color.rgb = atmosLighting(color.rgb);
color.rgb = scaleSoftClip(color.rgb);