From 485c5978e7559471f4dad66fb141408262d75363 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Fri, 31 May 2019 09:19:34 -0700 Subject: SL-11051 Make shadow alpha mask shader ignore vert alpha (if it mattered, it'd be blended anyway). Modify deferred fullbrightF to use same handling of alpha masking as shadows for consistency (esp when mask cutoff == 0). --- .../newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 7 ++++++- .../app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl index c104dc884f..f7368e8652 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl @@ -65,7 +65,12 @@ void main() float final_alpha = color.a * vertex_color.a; #ifdef HAS_ALPHA_MASK - if (color.a < minimum_alpha) + if (color.a < 0.05) + { + discard; + } + + if (minimum_alpha > 0 && color.a < minimum_alpha) { discard; } diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl index d79d2423f1..96e6f11b96 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl @@ -43,7 +43,8 @@ void main() { float alpha = diffuseLookup(vary_texcoord0.xy).a; - alpha *= vertex_color.a; + // SL-11051 + //alpha *= vertex_color.a; if (alpha < 0.05) // treat as totally transparent { -- cgit v1.2.3