diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-03 11:45:17 -0700 | 
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-03 11:45:17 -0700 | 
| commit | 8d32aade01b0b87bd626a81f68b210538e90095b (patch) | |
| tree | ad50edfe62ebdc4c1bd919de45f36692612e9ea7 /indra/newview/app_settings/shaders/class1/deferred | |
| parent | 6d13430d78f2fa18577fc2a43e8d182852e826b7 (diff) | |
SL-11090
Tamp down bloom so we don't have to redo ten thousand gloss maps.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 4 | 
2 files changed, 4 insertions, 4 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;              }          } | 
