From 17615dd6b67f1ca019a44664318550240d289372 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 12 Apr 2023 08:58:20 -0500
Subject: DRTVWR-559 Fix for burn-in on legacy gloss materials.
---
indra/newview/app_settings/shaders/class1/environment/srgbF.glsl | 5 -----
.../app_settings/shaders/class3/deferred/reflectionProbeF.glsl | 2 ++
2 files changed, 2 insertions(+), 5 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl b/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl
index a3b48e0898..3cca84ca14 100644
--- a/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl
+++ b/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl
@@ -93,16 +93,11 @@ vec3 legacy_adjust_no_brighten(vec3 c)
vec3 legacy_adjust(vec3 c)
{
-#if 1
vec3 desat = rgb2hsv(c.rgb);
desat.g *= 1.0-(1.0-desat.b)*0.5;
- //desat.g = max(desat.g-0.1*c.b-0.1, 0.0);
desat.b += (1.0-desat.b)*0.1f;
desat.rgb = hsv2rgb(desat);
return desat;
-#else
- return c;
-#endif
}
vec3 legacy_adjust_post(vec3 c)
diff --git a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
index e1b18935e8..55a43f76d0 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
@@ -752,6 +752,8 @@ void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout
legacyenv = mix(legacyenv, ssr.rgb, w);
}
#endif
+
+ glossenv = clamp(glossenv, vec3(0), vec3(10));
}
void applyGlossEnv(inout vec3 color, vec3 glossenv, vec4 spec, vec3 pos, vec3 norm)
--
cgit v1.2.3