From 6dbc72df774a99cd80c4a690e7d03017d39005e9 Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Tue, 17 Mar 2020 13:46:52 -0600
Subject: SL-10449 remove soft gamma adjustment that breaks Mac GLSL compiler
---
indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'indra')
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index a8a5cc22db..f1b13c8825 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -336,7 +336,10 @@ void main()
if (emissive_brightness >= 1.0) // fullbright, skip lighting calculations
{
color = fullbrightAtmosTransportFrag(diffuse_srgb.rgb, additive, atten);
- color = fullbrightScaleSoftClip(color);
+ // This call breaks the Mac GLSL compiler/linker for unknown reasons (17Mar2020)
+ // The call is either a no-op or a pure (pow) gamma adjustment, depending on GPU level
+ // TODO: determine if we want to re-apply the gamma adjustment, and if so understand & fix Mac breakage
+ //color = fullbrightScaleSoftClip(color);
al = diffuse_srgb.a;
}
--
cgit v1.2.3