SL-11090

Tamp down bloom so we don't have to redo ten thousand gloss maps.

4 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 54bed38fb7..541d6bd4fb 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -357,9 +357,9 @@ vec3 post_diffuse = color.rgb;
         if (nh > 0.0)
         {
             float scol = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
-            vec3 speccol = sun_contrib*scol*spec.rgb;
+            vec3 speccol = sun_contrib*scol*spec.rgb*0.25;
             speccol = clamp(speccol, vec3(0), vec3(1));
-            bloom = dot(speccol, speccol) / 6.0f;
+            bloom = dot(speccol, speccol);
             color += speccol;
         }
     }
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index d13a717761..9d6958381b 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -144,9 +144,9 @@ vec3 post_diffuse = color.rgb;
             if (nh > 0.0)
             {
                 float scontrib = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
-                vec3 speccol = sun_contrib*scontrib*spec.rgb;
+                vec3 speccol = sun_contrib*scontrib*spec.rgb*0.25;
                 speccol = clamp(speccol, vec3(0), vec3(1));
-                bloom += dot(speccol, speccol) / 12.0;
+                bloom += dot(speccol, speccol);
                 color += speccol;
             }
         }
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 8fcd26eba9..430b85eee1 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -151,9 +151,9 @@ vec3 post_diffuse = color.rgb;
             if (nh > 0.0)
             {
                 float scontrib = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
-                vec3 speccol = sun_contrib*scontrib*spec.rgb;
+                vec3 speccol = sun_contrib*scontrib*spec.rgb * 0.25;
                 speccol = clamp(speccol, vec3(0), vec3(1));
-                bloom += dot (speccol, speccol) / 12;
+                bloom += dot (speccol, speccol);
                 color += speccol;
             }
         }
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
index ad721a80d6..6400e5169e 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
@@ -146,8 +146,8 @@ void main()
             vec3 dumbshiny = scol * texture2D(lightFunc, vec2(sa, spec.a)).r * atmo_color;
             
             // add the two types of shiny together
-            vec3 spec_contrib = dumbshiny * spec.rgb;
-            bloom = dot(spec_contrib, spec_contrib) / 6;
+            vec3 spec_contrib = dumbshiny * spec.rgb * 0.25;
+            bloom = dot(spec_contrib, spec_contrib);
             col += spec_contrib;
         }