diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-31 09:19:34 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-31 09:19:34 -0700 |
| commit | 485c5978e7559471f4dad66fb141408262d75363 (patch) | |
| tree | 3374bcb6ea79fce674663884a5b71a8af4de00f6 /indra | |
| parent | e9b2aa384a84c2e1b5f93f81b72eb028b292ae6a (diff) | |
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).
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 7 | ||||
| -rw-r--r-- | indra/newview/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 { |