summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-04-14 19:00:25 +0000
committerDave Houlton <euclid@lindenlab.com>2020-04-14 19:00:25 +0000
commit693791f4ffdf5471b16459ba295a50615bbc7762 (patch)
tree84191c01a848bfc0810b95d5baa6534230ebcb3e /indra/newview
parentee88ebf9e924882d0ac5baf0908fc9d6f437cfa2 (diff)
parentff27f6c8f77cc910f240b057b58fffa49023bdc1 (diff)
Merged in euclid-13019 (pull request #70)
SL-13019, fix broken varying linkage on MacOS Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/softenLightV.glsl9
-rw-r--r--indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl1
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightV.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightV.glsl
index 8b8b338f68..bd11aa3f05 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightV.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightV.glsl
@@ -31,10 +31,19 @@ uniform vec2 screen_res;
VARYING vec2 vary_fragcoord;
+// forwards
+void setAtmosAttenuation(vec3 c);
+void setAdditiveColor(vec3 c);
+
void main()
{
//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
+ setAtmosAttenuation(vec3(1));
+ setAdditiveColor(vec3(0));
+
vary_fragcoord = (pos.xy*0.5+0.5)*screen_res;
}
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl
index ea37610502..d758f85d71 100644
--- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl
+++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl
@@ -24,7 +24,6 @@
*/
-VARYING vec3 vary_SunlitColor;
VARYING vec3 vary_AdditiveColor;
VARYING vec3 vary_AtmosAttenuation;