From f89db964071121812baa4d81ce065f3579701251 Mon Sep 17 00:00:00 2001 From: Ptolemy Date: Thu, 7 Jan 2021 10:39:55 -0800 Subject: SL-14035 revert incorrect removal of glare --- indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/app_settings/shaders') 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); } } } -- cgit v1.2.3