diff options
author | Ptolemy <ptolemy@lindenlab.com> | 2021-01-07 10:39:55 -0800 |
---|---|---|
committer | Ptolemy <ptolemy@lindenlab.com> | 2021-01-07 10:39:55 -0800 |
commit | f89db964071121812baa4d81ce065f3579701251 (patch) | |
tree | 89a7fd32777fe39efae966dba1a5cedd2801f84b /indra | |
parent | a5aac898093371fddf3c7323c9dadc2f5be15583 (diff) |
SL-14035 revert incorrect removal of glare
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl index bb69e45816..e1f7031af6 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -159,6 +159,11 @@ vec3 calcPointLightOrSpotLight(vec3 light_col, vec3 npos, vec3 diffuse, vec4 spe vec3 speccol = lit*scol*light_col.rgb*spec.rgb; speccol = clamp(speccol, vec3(0), vec3(1)); col += speccol; + + float cur_glare = max(speccol.r, speccol.g); + cur_glare = max(cur_glare, speccol.b); + glare = max(glare, speccol.r); + glare += max(cur_glare, 0.0); } } } |