summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2019-04-03 16:01:12 -0700
committerGeenz <geenz@geenzo.com>2019-04-03 16:01:12 -0700
commita615dc049ec1f57d3938a8b49a8f0502b4ce2523 (patch)
treec4cf55517646e16df39b6252598ee2c1cdbaec27 /indra
parent0e9193d84c0f96b890123f092f22f81ae84fe6dc (diff)
Bring back specular bloom.
--HG-- branch : BUG-226620
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl1
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl1
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index 97b5e56529..e44b441727 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -141,6 +141,7 @@ void main()
float scol = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
vec3 speccol = sun_contrib*scol*spec.rgb;
speccol = max(speccol, vec3(0));
+ bloom = dot (speccol, speccol) / 2;
col += speccol;
}
}
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 42258cc729..3192f056a5 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -154,6 +154,7 @@ void main()
float scontrib = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
vec3 speccol = sun_contrib*scontrib*spec.rgb;
speccol = max(speccol, vec3(0));
+ bloom += dot (speccol, speccol) / 2;
col += speccol;
}
}