diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-03-17 20:33:34 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-03-17 20:33:34 +0000 |
| commit | 332232c532b006dff18c6b6c20da1ef475db14bb (patch) | |
| tree | bd271129d8c32742a00d7b43f1ad28fce673e321 | |
| parent | efd69ead5ed155b334d1730f702be257956e5f5f (diff) | |
| parent | 6dbc72df774a99cd80c4a690e7d03017d39005e9 (diff) | |
Merged in euclid_SL-10449 (pull request #40)
SL-10449 remove soft gamma adjustment that breaks Mac GLSL compiler
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 5 |
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; } |