summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-04-15 11:52:24 -0700
committerGraham Linden <graham@lindenlab.com>2019-04-15 11:52:24 -0700
commit508ca2d458b6ae23909c88615498b629da0ca76e (patch)
tree74635bcbed6bdc4808a66c8d5ba60dd9f848b7ff /indra
parent37a7c96f1724332ccddde36bf5095b99af95fe8f (diff)
SL-10959
Scale down of bloom was off by a factor of 3 or so.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl2
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index 476a1216d3..71fbe5df57 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -152,7 +152,7 @@ vec3 post_diffuse = col.rgb;
float scol = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
vec3 speccol = sun_contrib*scol*spec.rgb;
speccol = clamp(speccol, vec3(0), vec3(1));
- bloom = dot(speccol, speccol) / 2;
+ bloom = dot(speccol, speccol) / 6;
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 6bebb79f31..737fb0fef7 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -166,7 +166,7 @@ vec3 post_diffuse = col.rgb;
float scontrib = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
vec3 speccol = sun_contrib*scontrib*spec.rgb;
speccol = clamp(speccol, vec3(0), vec3(1));
- bloom += dot (speccol, speccol) / 2;
+ bloom += dot (speccol, speccol) / 6;
col += speccol;
}
}