From 07bff3129adaabb90f09b71fa65c8be0c3ecef5d Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 19 Dec 2018 14:59:19 -0800
Subject: Add new shaders for advanced atmo SH env lighting calcs.

---
 .../shaders/class3/deferred/shadowAlphaMaskF.glsl  | 74 ++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 indra/newview/app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl

(limited to 'indra/newview/app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl')

diff --git a/indra/newview/app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl
new file mode 100644
index 0000000000..d6ed5b6bb0
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl
@@ -0,0 +1,74 @@
+/** 
+ * @file class3/deferred/shadowAlphaMaskF.glsl
+ *
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+/*[EXTRA_CODE_HERE]*/
+
+#ifdef DEFINE_GL_FRAGCOLOR
+out vec4 frag_color;
+#else
+#define frag_color gl_FragColor
+#endif
+
+uniform sampler2D diffuseMap;
+
+#if !DEPTH_CLAMP
+VARYING float pos_zd2;
+#endif
+
+VARYING float pos_w;
+
+VARYING float target_pos_x;
+VARYING vec4 vertex_color;
+VARYING vec2 vary_texcoord0;
+
+vec4 getPosition(vec2 screen_coord);
+vec4 computeMoments(float depth, float a);
+
+void main() 
+{
+    vec4 pos = getPosition(vary_texcoord0.xy);
+
+    float alpha = diffuseLookup(vary_texcoord0.xy).a * vertex_color.a;
+
+    if (alpha < 0.05) // treat as totally transparent
+    {
+        discard;
+    }
+
+    if (alpha < 0.88) // treat as semi-transparent
+    {
+        if (fract(0.5*floor(target_pos_x / pos_w )) < 0.25)
+        {
+            discard;
+        }
+    }
+
+    frag_color = computeMoments(length(pos.xyz), alpha);
+    
+#if !DEPTH_CLAMP
+    gl_FragDepth = max(pos_zd2/pos_w+0.5, 0.0);
+#endif
+
+}
-- 
cgit v1.2.3


From 066eb59808d5649c745fdc6c37b62f2eb9a19b6f Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 17 Jan 2019 08:32:09 -0800
Subject: SL-10368

Fix OSX shader compile bug from use of #if FOO instead of #ifdef FOO or #if defined(FOO)
preventing atmospherics (and thus ALM) from working on OSX.
---
 .../app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl')

diff --git a/indra/newview/app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl
index d6ed5b6bb0..50f1ffd626 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/shadowAlphaMaskF.glsl
@@ -33,7 +33,7 @@ out vec4 frag_color;
 
 uniform sampler2D diffuseMap;
 
-#if !DEPTH_CLAMP
+#if !defined(DEPTH_CLAMP)
 VARYING float pos_zd2;
 #endif
 
@@ -67,7 +67,7 @@ void main()
 
     frag_color = computeMoments(length(pos.xyz), alpha);
     
-#if !DEPTH_CLAMP
+#if !defined(DEPTH_CLAMP)
     gl_FragDepth = max(pos_zd2/pos_w+0.5, 0.0);
 #endif
 
-- 
cgit v1.2.3