summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-04-25 14:29:05 -0700
committerGraham Linden <graham@lindenlab.com>2019-04-25 14:29:05 -0700
commitdbb72176e8086b9a92e301c689e63c16dc704a98 (patch)
treed4522bc55802a37348be8183feea59a16e19b2c4
parent5766325290974ee2cfa30fd655060ef396d1e87a (diff)
SL-11051
Fix alpha tests in alpha mask shadow shader to not include potentially incorrect vert color alpha in decision.
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl
index 1791d3e315..dd762958c4 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl
@@ -45,7 +45,7 @@ VARYING vec2 vary_texcoord0;
void main()
{
- float alpha = diffuseLookup(vary_texcoord0.xy).a * vertex_color.a;
+ float alpha = diffuseLookup(vary_texcoord0.xy).a;
if (alpha < 0.05) // treat as totally transparent
{
@@ -60,6 +60,8 @@ void main()
}
}
+ alpha *= vertex_color.a;
+
frag_color = vec4(1,1,1,1);
#if !defined(DEPTH_CLAMP)