From 94d4ae298b38630e6d936efc02d7d1a701f0ac1c Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 23 Apr 2019 12:52:48 -0700
Subject: [PATCH] SL-10901 part 1
Fix flicker even in no shadow ALM from pow on final_da.
Shadow acne at Midday still present.
---
.../app_settings/shaders/class1/deferred/softenLightF.glsl | 4 ++--
.../app_settings/shaders/class2/deferred/softenLightF.glsl | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index 8d126859c3e..6f18244875a 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -93,7 +93,7 @@ void main()
float final_da = da;
final_da = clamp(final_da, 0.0, 1.0);
- final_da = pow(final_da, light_gamma);
+ //final_da = pow(final_da, light_gamma);
vec4 diffuse = texture2DRect(diffuseRect, tc);
@@ -177,7 +177,7 @@ vec3 post_diffuse = col.rgb;
bloom = fogged.a;
#endif
-//col.rgb = post_diffuse;
+//col.rgb = vec3(final_da);
}
frag_color.rgb = col.rgb;
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index a1d12878250..f1c06fcc8a4 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -106,7 +106,7 @@ void main()
float final_da = da;
final_da = clamp(final_da, 0.0, 1.0);
- final_da = pow(final_da, light_gamma);
+ //final_da = pow(final_da, light_gamma);
vec4 spec = texture2DRect(specularRect, vary_fragcoord.xy);
vec3 col;
--
GitLab