From cdad939bbd6fbed4cfc863469d5c37e17bbcf698 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 20 Mar 2019 12:09:56 -0700 Subject: SL-10449 Make setting ALM from Mid through High graphics possible on OSX by fixing link error from softenLight shader. Set values to the atmos attenuation and additive color varyings to avoid warnerror from OSX GLSL compiler/linker. --- .../shaders/class1/deferred/softenLightV.glsl | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightV.glsl index e992776cb4..f1ada39854 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightV.glsl @@ -29,12 +29,17 @@ ATTRIBUTE vec3 position; uniform vec2 screen_res; +void setAttenuation(vec3 c); +void setAdditiveColor(vec3 c); + VARYING vec2 vary_fragcoord; void main() { - //transform vertex - vec4 pos = modelview_projection_matrix * vec4(position.xyz, 1.0); - gl_Position = pos; - - vary_fragcoord = (pos.xy*0.5+0.5)*screen_res; + //transform vertex + vec4 pos = modelview_projection_matrix * vec4(position.xyz, 1.0); + gl_Position = pos; + // appease OSX GLSL compiler/linker by touching all the varyings we said we would + setAttenuation(vec3(1)); + setAdditiveColor(vec3(0)); + vary_fragcoord = (pos.xy*0.5+0.5)*screen_res; } -- cgit v1.2.3