summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-03-17 13:46:52 -0600
committerDave Houlton <euclid@lindenlab.com>2020-03-17 14:02:05 -0600
commit6dbc72df774a99cd80c4a690e7d03017d39005e9 (patch)
treebd271129d8c32742a00d7b43f1ad28fce673e321 /indra/newview
parentefd69ead5ed155b334d1730f702be257956e5f5f (diff)
SL-10449 remove soft gamma adjustment that breaks Mac GLSL compiler
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/materialF.glsl5
1 files changed, 4 insertions, 1 deletions
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;
}