Merged in euclid_SL-10449 (pull request #40)

SL-10449 remove soft gamma adjustment that breaks Mac GLSL compiler
meow-7.2.2
Dave Houlton 2020-03-17 20:33:34 +00:00
commit 332232c532
1 changed files with 4 additions and 1 deletions

View File

@ -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;
}