summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-04-23 12:52:48 -0700
committerGraham Linden <graham@lindenlab.com>2019-04-23 12:52:48 -0700
commit94d4ae298b38630e6d936efc02d7d1a701f0ac1c (patch)
treedc339091130e121204e919ade572c7513d3c8a4a /indra
parent6ee2fadaa8fd782eccff29777dc93aa508c5bf74 (diff)
SL-10901 part 1
Fix flicker even in no shadow ALM from pow on final_da. Shadow acne at Midday still present.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl4
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl2
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 8d126859c3..6f18244875 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 a1d1287825..f1c06fcc8a 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;