From e97c52bdd3cfdf12c3eb2e423b193979de816f34 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 4 Oct 2017 14:36:41 -0700
Subject: Rename uniform "sunlight_color_copy" to sunlight_color in shader.

---
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
index 6ff860362c..89b6a52909 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
  
-uniform vec4 sunlight_color_copy;
+uniform vec4 sunlight_color;
 uniform vec4 light_ambient;
 
 vec3 atmosAmbient(vec3 light)
@@ -33,12 +33,12 @@ vec3 atmosAmbient(vec3 light)
 
 vec3 atmosAffectDirectionalLight(float lightIntensity)
 {
-	return sunlight_color_copy.rgb * lightIntensity;
+	return sunlight_color.rgb * lightIntensity;
 }
 
 vec3 atmosGetDiffuseSunlightColor()
 {
-	return sunlight_color_copy.rgb;
+	return sunlight_color.rgb;
 }
 
 vec3 scaleDownLight(vec3 light)
-- 
cgit v1.2.3


From 4f6682ca29cefb83ac2307657d8605f96051da19 Mon Sep 17 00:00:00 2001
From: "Graham Linden graham@lindenlab.com"
 <Graham Linden graham@lindenlab.com>
Date: Mon, 12 Mar 2018 22:26:22 +0100
Subject: De-duplicate deferred shader code for atmospherics and transport.

---
 .../newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
index aacc503e13..584bd568c5 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
@@ -31,3 +31,8 @@ vec3 atmosLighting(vec3 light)
 	return light;
 }
 
+
+void calcFragAtmospherics(vec3 inPositionEye, float ambFactor) {
+	/* stub function for fallback compatibility on class1 hardware */
+}
+
-- 
cgit v1.2.3


From 6bcbc8b553e85d5debe75b08081fb033cf2eacc0 Mon Sep 17 00:00:00 2001
From: "Graham Linden graham@lindenlab.com"
 <Graham Linden graham@lindenlab.com>
Date: Mon, 12 Mar 2018 22:43:52 +0100
Subject: Add new shader files missed in last commit.

---
 .../class1/windlight/atmosphericsHelpersF.glsl     | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
new file mode 100644
index 0000000000..3f70a8935b
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
@@ -0,0 +1,55 @@
+/** 
+ * @file atmosphericsHelpersF.glsl 
+ *
+ * $LicenseInfo:firstyear=2005&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2005, 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$
+ */
+ 
+uniform vec4 sunlight_color;
+uniform vec4 light_ambient;
+
+vec3 atmosAmbient(vec3 light)
+{
+	return light + light_ambient.rgb;
+}
+
+vec3 atmosAffectDirectionalLight(float lightIntensity)
+{
+	return sunlight_color.rgb * lightIntensity;
+}
+
+vec3 atmosGetDiffuseSunlightColor()
+{
+	return sunlight_color.rgb;
+}
+
+vec3 scaleDownLight(vec3 light)
+{
+	/* stub function for fallback compatibility on class1 hardware */
+	return light;
+}
+
+vec3 scaleUpLight(vec3 light)
+{
+	/* stub function for fallback compatibility on class1 hardware */
+	return light;
+}
+
-- 
cgit v1.2.3


From 507c4921826e73635f6ae31087ab0e6cd1280f43 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 8 Jun 2018 22:22:20 +0100
Subject: Add specific shader for the moon to allow different rendering at day
 vs night.

Add MouseMoon positioning ala MouseSun debug setting and accessors to use it.
---
 .../shaders/class1/windlight/moonF.glsl            | 58 ++++++++++++++++++++++
 .../shaders/class1/windlight/moonV.glsl            | 48 ++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
 create mode 100644 indra/newview/app_settings/shaders/class1/windlight/moonV.glsl

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
new file mode 100644
index 0000000000..14b08b1da4
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
@@ -0,0 +1,58 @@
+/** 
+ * @file moonF.glsl
+ *
+ * $LicenseInfo:firstyear=2005&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2005, 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$
+ */
+ 
+#extension GL_ARB_texture_rectangle : enable
+
+/*[EXTRA_CODE_HERE]*/
+
+#ifdef DEFINE_GL_FRAGCOLOR
+out vec4 frag_color;
+#else
+#define frag_color gl_FragColor
+#endif
+
+vec3 fullbrightAtmosTransport(vec3 light);
+vec3 fullbrightScaleSoftClip(vec3 light);
+
+uniform vec4 color;
+uniform vec4 sunlight_color;
+uniform vec3 lumWeights;
+uniform float minLuminance;
+uniform sampler2D diffuseMap;
+VARYING vec2 vary_texcoord0;
+
+void main() 
+{
+	vec4 c = texture2D(diffuseMap, vary_texcoord0.xy);
+	c.rgb = fullbrightAtmosTransport(c.rgb);
+    c.rgb = fullbrightScaleSoftClip(c.rgb);
+    c.rgb = pow(c.rgb, vec3(0.45f));
+    // mix factor which blends when sunlight is brighter
+    // and shows true moon color at night
+    float mix = dot(normalize(sunlight_color.rgb), lumWeights);
+    mix = smoothstep(-0.5f, 2.0f, lum);
+	frag_color = vec4(c.rgb, mix * c.a);
+}
+
diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
new file mode 100644
index 0000000000..7c4dfbd999
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
@@ -0,0 +1,48 @@
+/** 
+ * @file moonV.glsl
+ *
+  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2007, 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$
+ */
+
+uniform mat4 texture_matrix0;
+uniform mat4 modelview_matrix;
+uniform mat4 modelview_projection_matrix;
+
+ATTRIBUTE vec3 position;
+ATTRIBUTE vec2 texcoord0;
+
+//void calcAtmospherics(vec3 inPositionEye);
+
+VARYING vec2 vary_texcoord0;
+
+void main()
+{
+	//transform vertex
+	vec4 vert = vec4(position.xyz, 1.0);
+	vec4 pos = (modelview_matrix * vert);
+
+	gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0);
+	
+	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
+	
+	//calcAtmospherics(pos.xyz);
+}
-- 
cgit v1.2.3


From a0598b12656cdcf22ba95cacd01b5ff36f8f1b26 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 11 Jun 2018 17:46:16 +0100
Subject: Fix water fog consolidation in underwater shaders.

Add plumbing facilities to allow current and next moon textures to be passed to moon shader.

Modify moon shader to blend between current and next moon textures by blend factor.
---
 indra/newview/app_settings/shaders/class1/windlight/moonF.glsl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
index 14b08b1da4..4d0d8882b9 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
@@ -41,18 +41,23 @@ uniform vec4 sunlight_color;
 uniform vec3 lumWeights;
 uniform float minLuminance;
 uniform sampler2D diffuseMap;
+uniform sampler2D altDiffuseMap;
+uniform float blend_factor; // interp factor between moon A/B
 VARYING vec2 vary_texcoord0;
 
 void main() 
 {
-	vec4 c = texture2D(diffuseMap, vary_texcoord0.xy);
+	vec4 moonA = texture2D(diffuseMap, vary_texcoord0.xy);
+	vec4 moonB = texture2D(altDiffuseMap, vary_texcoord0.xy);
+    vec4 c     = mix(moonA, moonB, blend_factor);
+
 	c.rgb = fullbrightAtmosTransport(c.rgb);
     c.rgb = fullbrightScaleSoftClip(c.rgb);
     c.rgb = pow(c.rgb, vec3(0.45f));
     // mix factor which blends when sunlight is brighter
     // and shows true moon color at night
     float mix = dot(normalize(sunlight_color.rgb), lumWeights);
-    mix = smoothstep(-0.5f, 2.0f, lum);
+    mix = smoothstep(-0.5f, 2.0f, mix);
 	frag_color = vec4(c.rgb, mix * c.a);
 }
 
-- 
cgit v1.2.3


From 5c2f49b86511f88de520f4297f20e6382139a927 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 27 Jun 2018 22:00:50 +0100
Subject: Make distinct ALM moon shader, tweak mix factor for day vs night moon
 shading, and fix transposed name of daycycle func.

---
 indra/newview/app_settings/shaders/class1/windlight/moonF.glsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
index 4d0d8882b9..933625986c 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
@@ -51,13 +51,13 @@ void main()
 	vec4 moonB = texture2D(altDiffuseMap, vary_texcoord0.xy);
     vec4 c     = mix(moonA, moonB, blend_factor);
 
+    c.rgb = pow(c.rgb, vec3(0.45f));
 	c.rgb = fullbrightAtmosTransport(c.rgb);
     c.rgb = fullbrightScaleSoftClip(c.rgb);
-    c.rgb = pow(c.rgb, vec3(0.45f));
     // mix factor which blends when sunlight is brighter
     // and shows true moon color at night
-    float mix = dot(normalize(sunlight_color.rgb), lumWeights);
-    mix = smoothstep(-0.5f, 2.0f, mix);
+    vec3 luma_weights = vec3(0.1, 0.3, 0.0);
+    float mix = 1.0f - dot(sunlight_color.rgb, luma_weights);
 	frag_color = vec4(c.rgb, mix * c.a);
 }
 
-- 
cgit v1.2.3


From 8969b114357d189e1bf39024762698eeddddfc78 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 3 Jul 2018 16:37:32 +0100
Subject: MAINT-8838 render a sun disc if the texture(s) are provided by WL
 settings (default is no sun disc and just haze)

Refactor sky texture optimization to retain building the cubemap used by shiny.
---
 .../shaders/class1/windlight/moonF.glsl            |  2 +-
 .../shaders/class1/windlight/sunDiscF.glsl         | 54 ++++++++++++++++++++++
 .../shaders/class1/windlight/sunDiscV.glsl         | 44 ++++++++++++++++++
 3 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
 create mode 100644 indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
index 933625986c..480a0e1dc4 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
@@ -49,7 +49,7 @@ void main()
 {
 	vec4 moonA = texture2D(diffuseMap, vary_texcoord0.xy);
 	vec4 moonB = texture2D(altDiffuseMap, vary_texcoord0.xy);
-    vec4 c     = mix(moonA, moonB, blend_factor);
+    vec4 c     = mix(moonB, moonA, blend_factor);
 
     c.rgb = pow(c.rgb, vec3(0.45f));
 	c.rgb = fullbrightAtmosTransport(c.rgb);
diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
new file mode 100644
index 0000000000..0eb32b69b8
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
@@ -0,0 +1,54 @@
+/** 
+ * @file sunDiscF.glsl
+ *
+ * $LicenseInfo:firstyear=2005&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2005, 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$
+ */
+ 
+#extension GL_ARB_texture_rectangle : enable
+
+/*[EXTRA_CODE_HERE]*/
+
+#ifdef DEFINE_GL_FRAGCOLOR
+out vec4 frag_color;
+#else
+#define frag_color gl_FragColor
+#endif
+
+vec3 fullbrightAtmosTransport(vec3 light);
+vec3 fullbrightScaleSoftClip(vec3 light);
+
+uniform sampler2D diffuseMap;
+uniform sampler2D altDiffuseMap;
+uniform float blend_factor; // interp factor between sun A/B
+VARYING vec2 vary_texcoord0;
+
+void main() 
+{
+	vec4 sunA = texture2D(diffuseMap, vary_texcoord0.xy);
+	vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy);
+    vec4 c     = mix(sunB, sunA, blend_factor);
+    c.rgb = pow(c.rgb, vec3(0.45f));
+	c.rgb = fullbrightAtmosTransport(c.rgb);
+    c.rgb = fullbrightScaleSoftClip(c.rgb);
+	frag_color = c;
+}
+
diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
new file mode 100644
index 0000000000..3bf50ddd0a
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
@@ -0,0 +1,44 @@
+/** 
+ * @file sunDiscV.glsl
+ *
+  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2007, 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$
+ */
+
+uniform mat4 texture_matrix0;
+uniform mat4 modelview_matrix;
+uniform mat4 modelview_projection_matrix;
+
+ATTRIBUTE vec3 position;
+ATTRIBUTE vec2 texcoord0;
+
+VARYING vec2 vary_texcoord0;
+
+void main()
+{
+	//transform vertex
+	vec4 vert = vec4(position.xyz, 1.0);
+	vec4 pos = (modelview_matrix * vert);
+
+	gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0);
+	
+	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
+}
-- 
cgit v1.2.3


From c7478f200cf5f57120148fdd79f76b9d3eff0258 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 11 Jul 2018 18:03:07 +0100
Subject: Make sun/moon vert shaders use calcAtmospherics in hopes it will get
 OSX GL to link the shaders without complaining about unwritten varying vars.

---
 indra/newview/app_settings/shaders/class1/windlight/moonV.glsl    | 4 ++--
 indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
index 7c4dfbd999..aaa6768ed7 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
@@ -30,7 +30,7 @@ uniform mat4 modelview_projection_matrix;
 ATTRIBUTE vec3 position;
 ATTRIBUTE vec2 texcoord0;
 
-//void calcAtmospherics(vec3 inPositionEye);
+void calcAtmospherics(vec3 inPositionEye);
 
 VARYING vec2 vary_texcoord0;
 
@@ -44,5 +44,5 @@ void main()
 	
 	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
 	
-	//calcAtmospherics(pos.xyz);
+	calcAtmospherics(pos.xyz);
 }
diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
index 3bf50ddd0a..5a6e481b18 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
@@ -32,6 +32,8 @@ ATTRIBUTE vec2 texcoord0;
 
 VARYING vec2 vary_texcoord0;
 
+void calcAtmospherics(vec3 eye_pos);
+
 void main()
 {
 	//transform vertex
@@ -40,5 +42,7 @@ void main()
 
 	gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0);
 	
+    calcAtmospherics(pos.xyz);
+
 	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
 }
-- 
cgit v1.2.3


From b86e899e7e51c56252479236df9a74f9bb432670 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 23 Aug 2018 00:53:11 +0100
Subject: MAINT-9006

Make perspective projection consistent between ALM and non-ALM when drawing water (horizon matches).

Make perspective projection consistent between ALM and non-ALM when drawing heavenly bodies (sun disc position matches).

Make gamma correction of sun disc tex consistent between ALM and non-ALM rendering.
---
 indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl | 2 +-
 indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
index 0eb32b69b8..05251e7e96 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
@@ -46,7 +46,7 @@ void main()
 	vec4 sunA = texture2D(diffuseMap, vary_texcoord0.xy);
 	vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy);
     vec4 c     = mix(sunB, sunA, blend_factor);
-    c.rgb = pow(c.rgb, vec3(0.45f));
+    c.rgb = pow(c.rgb, vec3(0.7f));
 	c.rgb = fullbrightAtmosTransport(c.rgb);
     c.rgb = fullbrightScaleSoftClip(c.rgb);
 	frag_color = c;
diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
index 5a6e481b18..90acb5be9e 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
@@ -38,9 +38,9 @@ void main()
 {
 	//transform vertex
 	vec4 vert = vec4(position.xyz, 1.0);
-	vec4 pos = (modelview_matrix * vert);
+	vec4 pos = modelview_projection_matrix*vert;
 
-	gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0);
+	gl_Position = pos;
 	
     calcAtmospherics(pos.xyz);
 
-- 
cgit v1.2.3


From 6dd9dd3ab63cb0daa7682a400ff0408fd894ba77 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 30 Aug 2018 17:54:59 +0100
Subject: MAINT-9064

Fix binding of current/next sun/moon textures.

Remove redundant code in GLSLShader determination of tex uniform bindings.

Unhack mix calls in sun/moon shaders to reverse sense of blending (was working around reversed bindings).
---
 indra/newview/app_settings/shaders/class1/windlight/moonF.glsl    | 2 +-
 indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
index 480a0e1dc4..933625986c 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
@@ -49,7 +49,7 @@ void main()
 {
 	vec4 moonA = texture2D(diffuseMap, vary_texcoord0.xy);
 	vec4 moonB = texture2D(altDiffuseMap, vary_texcoord0.xy);
-    vec4 c     = mix(moonB, moonA, blend_factor);
+    vec4 c     = mix(moonA, moonB, blend_factor);
 
     c.rgb = pow(c.rgb, vec3(0.45f));
 	c.rgb = fullbrightAtmosTransport(c.rgb);
diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
index 05251e7e96..3f2375ee4d 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
@@ -45,7 +45,7 @@ void main()
 {
 	vec4 sunA = texture2D(diffuseMap, vary_texcoord0.xy);
 	vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy);
-    vec4 c     = mix(sunB, sunA, blend_factor);
+    vec4 c     = mix(sunA, sunB, blend_factor);
     c.rgb = pow(c.rgb, vec3(0.7f));
 	c.rgb = fullbrightAtmosTransport(c.rgb);
     c.rgb = fullbrightScaleSoftClip(c.rgb);
-- 
cgit v1.2.3


From 08dd04aa98f9071d87a26573fb2807aaac1852eb Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 18 Sep 2018 19:47:50 +0100
Subject: SL-1176

Tweak position of sun in disc shader to better match the offset applied to the sun glow in atmospherics.
---
 indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
index 90acb5be9e..dd33a4be60 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
@@ -37,7 +37,7 @@ void calcAtmospherics(vec3 eye_pos);
 void main()
 {
 	//transform vertex
-	vec4 vert = vec4(position.xyz, 1.0);
+	vec4 vert = vec4(position.xyz - vec3(0, 0, 50), 1.0);
 	vec4 pos = modelview_projection_matrix*vert;
 
 	gl_Position = pos;
-- 
cgit v1.2.3


From ffc6393309d06446f9d1361f0f0282b2110768ae Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 8 Oct 2018 22:08:35 +0100
Subject: SL-9751

Add optional moon brightness setting
---
 .../app_settings/shaders/class1/windlight/moonF.glsl   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
index 933625986c..8cc7fc3bb5 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
@@ -39,6 +39,7 @@ vec3 fullbrightScaleSoftClip(vec3 light);
 uniform vec4 color;
 uniform vec4 sunlight_color;
 uniform vec3 lumWeights;
+uniform float moon_brightness;
 uniform float minLuminance;
 uniform sampler2D diffuseMap;
 uniform sampler2D altDiffuseMap;
@@ -51,13 +52,22 @@ void main()
 	vec4 moonB = texture2D(altDiffuseMap, vary_texcoord0.xy);
     vec4 c     = mix(moonA, moonB, blend_factor);
 
-    c.rgb = pow(c.rgb, vec3(0.45f));
+    if (c.a < 0.1f)
+    {
+        discard;
+    }
+
+	c.rgb = pow(c.rgb, vec3(0.7f));
 	c.rgb = fullbrightAtmosTransport(c.rgb);
     c.rgb = fullbrightScaleSoftClip(c.rgb);
+
     // mix factor which blends when sunlight is brighter
     // and shows true moon color at night
-    vec3 luma_weights = vec3(0.1, 0.3, 0.0);
-    float mix = 1.0f - dot(sunlight_color.rgb, luma_weights);
-	frag_color = vec4(c.rgb, mix * c.a);
+    vec3 luma_weights = vec3(0.2, 0.3, 0.2);
+    float mix = 1.0f - dot(normalize(sunlight_color.rgb), luma_weights);
+
+    c.rgb = pow(c.rgb, 1.2 - vec3(mix * moon_brightness));
+
+	frag_color = vec4(c.rgb, mix * (moon_brightness + (c.a * 0.25)));
 }
 
-- 
cgit v1.2.3


From ab634a764bef6eb61ffb76db5659253b06c37d5e Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 10 Oct 2018 22:11:01 +0100
Subject: Remove some unused atmospherics helpers and forward declarations of
 unused helper funcs.

---
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl | 6 ------
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl | 6 ------
 2 files changed, 12 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
index 3f70a8935b..c16e3d50a2 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
@@ -47,9 +47,3 @@ vec3 scaleDownLight(vec3 light)
 	return light;
 }
 
-vec3 scaleUpLight(vec3 light)
-{
-	/* stub function for fallback compatibility on class1 hardware */
-	return light;
-}
-
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
index 89b6a52909..9f68ca3dfa 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
@@ -47,9 +47,3 @@ vec3 scaleDownLight(vec3 light)
 	return light;
 }
 
-vec3 scaleUpLight(vec3 light)
-{
-	/* stub function for fallback compatibility on class1 hardware */
-	return light;
-}
-
-- 
cgit v1.2.3


From 56355cf35412589b0a171f33b7962fd3800c734a Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 30 Oct 2018 15:56:08 +0100
Subject: SL-9966

Port over transport, gamma, atmospherics shader stub updates for per-fragment atmospherics.

Fix bindings of current/next noise map when current and next are the same (select only one and force blend factor to 0).
---
 .../shaders/class1/windlight/atmosphericsF.glsl    | 21 ++++++++++++++----
 .../shaders/class1/windlight/gammaF.glsl           | 21 +++++++++++++-----
 .../shaders/class1/windlight/transportF.glsl       | 25 +++++++++++++++++-----
 3 files changed, 53 insertions(+), 14 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
index 584bd568c5..bf0a9048f0 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
@@ -23,16 +23,29 @@
  * $/LicenseInfo$
  */
  
+vec3 atmosFragAmbient(vec3 light, vec3 sunlit)
+{
+   return light;
+}
 
-
-vec3 atmosLighting(vec3 light)
+vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten)
 {
 	/* stub function for fallback compatibility on class1 hardware */
-	return light;
+   return light;
 }
 
+vec3 atmosFragAffectDirectionalLight(float light, vec3 sunlit)
+{
+   return light * sunlit;
+}
 
-void calcFragAtmospherics(vec3 inPositionEye, float ambFactor) {
+vec3 atmosLighting(vec3 light)
+{
+	return atmosFragLighting(light, vec3(0), vec3(1.0));
+}
+
+void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 atten, out vec3 additive)
+{
 	/* stub function for fallback compatibility on class1 hardware */
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
index 62f4e51449..b7f117fc5f 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
@@ -23,17 +23,28 @@
  * $/LicenseInfo$
  */
  
-
-
+uniform int no_atmo;
 uniform vec4 gamma;
 
-/// Soft clips the light with a gamma correction
-vec3 scaleSoftClip(vec3 light) {
+vec3 scaleFragSoftClip(vec3 light)
+{
 	// For compatibility with lower cards. Do nothing.
 	return light;
 }
 
+/// Soft clips the light with a gamma correction
+vec3 scaleSoftClip(vec3 light)
+{
+	// For compatibility with lower cards. Do nothing.
+	return scaleFragSoftClip(light);
+}
+
+vec3 fullbrightScaleSoftClipFrag(vec3 light, vec3 atten)
+{
+	return (no_atmo == 1) ? light : mix(scaleFragSoftClip(light.rgb), light.rgb, atten);
+}
+
 vec3 fullbrightScaleSoftClip(vec3 light) {
-	return scaleSoftClip(light);
+    return fullbrightScaleSoftClipFrag(light, vec3(1));
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
index 7c95ecdb14..c3c8329017 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
@@ -22,25 +22,40 @@
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
- 
 
+uniform int no_atmo;
 
-vec3 atmosTransport(vec3 light)
+vec3 atmosFragTransport(vec3 light, vec3 atten, vec3 additive)
 {
 	/* stub function for fallback compatibility on class1 hardware */
 	return light;
 }
 
-vec3 fullbrightAtmosTransport(vec3 light)
+vec3 fullbrightFragAtmosTransport(vec3 light, vec3 atten, vec3 additive)
 {
 	/* stub function for fallback compatibility on class1 hardware */
 	return light;
 }
 
+vec3 fullbrightFragShinyAtmosTransport(vec3 light, vec3 atten, vec3 additive)
+{
+	/* stub function for fallback compatibility on class1 hardware */
+    return light;
+}
 
-vec3 fullbrightShinyAtmosTransport(vec3 light)
+vec3 atmosTransport(vec3 light)
 {
 	/* stub function for fallback compatibility on class1 hardware */
-	return light;
+    return atmosFragTransport(light, vec3(1), vec3(0));
+}
+
+vec3 fullbrightAtmosTransport(vec3 light)
+{
+     return fullbrightFragAtmosTransport(light, vec3(1), vec3(0));
+}
+
+vec3 fullbrightShinyAtmosTransport(vec3 light)
+{
+    return fullbrightFragShinyAtmosTransport(light, vec3(1), vec3(0));
 }
 
-- 
cgit v1.2.3


From 9a8e124fdecbeb57f65645d102f5f1767f8e4d16 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 30 Oct 2018 18:17:47 +0100
Subject: SL-9976 change moon blend/brightness handling in shaders and cleanup
 extraneous GL state management.

---
 .../app_settings/shaders/class1/windlight/moonF.glsl    | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
index 8cc7fc3bb5..b66b56e0fb 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
@@ -33,9 +33,6 @@ out vec4 frag_color;
 #define frag_color gl_FragColor
 #endif
 
-vec3 fullbrightAtmosTransport(vec3 light);
-vec3 fullbrightScaleSoftClip(vec3 light);
-
 uniform vec4 color;
 uniform vec4 sunlight_color;
 uniform vec3 lumWeights;
@@ -52,22 +49,14 @@ void main()
 	vec4 moonB = texture2D(altDiffuseMap, vary_texcoord0.xy);
     vec4 c     = mix(moonA, moonB, blend_factor);
 
-    if (c.a < 0.1f)
-    {
-        discard;
-    }
-
-	c.rgb = pow(c.rgb, vec3(0.7f));
-	c.rgb = fullbrightAtmosTransport(c.rgb);
-    c.rgb = fullbrightScaleSoftClip(c.rgb);
-
     // mix factor which blends when sunlight is brighter
     // and shows true moon color at night
     vec3 luma_weights = vec3(0.2, 0.3, 0.2);
     float mix = 1.0f - dot(normalize(sunlight_color.rgb), luma_weights);
 
-    c.rgb = pow(c.rgb, 1.2 - vec3(mix * moon_brightness));
+    vec3 exp = vec3(1.0 - mix * moon_brightness) * 2.0 - 1.0;
+	c.rgb = pow(c.rgb, exp);
 
-	frag_color = vec4(c.rgb, mix * (moon_brightness + (c.a * 0.25)));
+	frag_color = vec4(c.rgb, c.a);
 }
 
-- 
cgit v1.2.3


From 4f267a5723e7da2de36b9f2295e4942a4c8bf6c5 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 1 Nov 2018 20:28:47 +0100
Subject: SL-9994

Make shaders use consistent naming and parameter order for transport and atmospheric helpers.

Share transport and gamma correction code where possible.

Add lots of asserts and other validation for when things don't go as planned.

Engage dumpShaderSource to get more source output with shader compilation fail.
---
 .../shaders/class1/windlight/gammaF.glsl           | 17 ++++++++-------
 .../shaders/class1/windlight/transportF.glsl       | 24 +++-------------------
 2 files changed, 13 insertions(+), 28 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
index b7f117fc5f..768d93f005 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
@@ -26,7 +26,7 @@
 uniform int no_atmo;
 uniform vec4 gamma;
 
-vec3 scaleFragSoftClip(vec3 light)
+vec3 scaleSoftClipFrag(vec3 light)
 {
 	// For compatibility with lower cards. Do nothing.
 	return light;
@@ -35,16 +35,19 @@ vec3 scaleFragSoftClip(vec3 light)
 /// Soft clips the light with a gamma correction
 vec3 scaleSoftClip(vec3 light)
 {
-	// For compatibility with lower cards. Do nothing.
-	return scaleFragSoftClip(light);
+	// For compatibility with lower cards. Do nothing
+	return light;
 }
 
-vec3 fullbrightScaleSoftClipFrag(vec3 light, vec3 atten)
+vec3 fullbrightScaleSoftClipFrag(vec3 light)
 {
-	return (no_atmo == 1) ? light : mix(scaleFragSoftClip(light.rgb), light.rgb, atten);
+	// For compatibility with lower cards. Do nothing
+	return light;
 }
 
-vec3 fullbrightScaleSoftClip(vec3 light) {
-    return fullbrightScaleSoftClipFrag(light, vec3(1));
+vec3 fullbrightScaleSoftClip(vec3 light)
+{
+	// For compatibility with lower cards. Do nothing
+    return light;
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
index c3c8329017..ebce9ea91d 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
@@ -25,37 +25,19 @@
 
 uniform int no_atmo;
 
-vec3 atmosFragTransport(vec3 light, vec3 atten, vec3 additive)
-{
-	/* stub function for fallback compatibility on class1 hardware */
-	return light;
-}
-
-vec3 fullbrightFragAtmosTransport(vec3 light, vec3 atten, vec3 additive)
-{
-	/* stub function for fallback compatibility on class1 hardware */
-	return light;
-}
-
-vec3 fullbrightFragShinyAtmosTransport(vec3 light, vec3 atten, vec3 additive)
-{
-	/* stub function for fallback compatibility on class1 hardware */
-    return light;
-}
-
 vec3 atmosTransport(vec3 light)
 {
 	/* stub function for fallback compatibility on class1 hardware */
-    return atmosFragTransport(light, vec3(1), vec3(0));
+    return light;
 }
 
 vec3 fullbrightAtmosTransport(vec3 light)
 {
-     return fullbrightFragAtmosTransport(light, vec3(1), vec3(0));
+    return light;
 }
 
 vec3 fullbrightShinyAtmosTransport(vec3 light)
 {
-    return fullbrightFragShinyAtmosTransport(light, vec3(1), vec3(0));
+    return light;
 }
 
-- 
cgit v1.2.3


From 8c1aefc17c710b55ed7a72bd9de14cbed58ccd31 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 6 Nov 2018 16:38:06 +0000
Subject: Remove scaleDownLight funcs and eliminate unused copy-pasted funcs in
 lighting shaders.

Also fix terrain response to atmospherics shaders (was failing to apply ambient on low end even when atmospherics was on).
---
 .../app_settings/shaders/class1/windlight/atmosphericsF.glsl   | 10 ++++++----
 .../shaders/class1/windlight/atmosphericsHelpersF.glsl         |  6 ------
 .../shaders/class1/windlight/atmosphericsHelpersV.glsl         |  6 ------
 3 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
index bf0a9048f0..c1cc3679a7 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
@@ -25,13 +25,14 @@
  
 vec3 atmosFragAmbient(vec3 light, vec3 sunlit)
 {
-   return light;
+    /* stub function for fallback compatibility on class1 hardware */
+    return light;
 }
 
 vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten)
 {
-	/* stub function for fallback compatibility on class1 hardware */
-   return light;
+    /* stub function for fallback compatibility on class1 hardware */
+	return light;
 }
 
 vec3 atmosFragAffectDirectionalLight(float light, vec3 sunlit)
@@ -41,7 +42,8 @@ vec3 atmosFragAffectDirectionalLight(float light, vec3 sunlit)
 
 vec3 atmosLighting(vec3 light)
 {
-	return atmosFragLighting(light, vec3(0), vec3(1.0));
+    /* stub function for fallback compatibility on class1 hardware */
+	return light;
 }
 
 void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 atten, out vec3 additive)
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
index c16e3d50a2..9e5893d32a 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
@@ -41,9 +41,3 @@ vec3 atmosGetDiffuseSunlightColor()
 	return sunlight_color.rgb;
 }
 
-vec3 scaleDownLight(vec3 light)
-{
-	/* stub function for fallback compatibility on class1 hardware */
-	return light;
-}
-
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
index 9f68ca3dfa..01f19087ff 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
@@ -41,9 +41,3 @@ vec3 atmosGetDiffuseSunlightColor()
 	return sunlight_color.rgb;
 }
 
-vec3 scaleDownLight(vec3 light)
-{
-	/* stub function for fallback compatibility on class1 hardware */
-	return light;
-}
-
-- 
cgit v1.2.3


From 2929998982f37221a58b9fa8037748a2e905f4b1 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 6 Nov 2018 19:33:04 +0000
Subject: Move to using a shared deferredUtil object for getting pos/norm from
 gbuffer.

Eliminate 20+ callsites with copy-paste of getPosition and/or getNorm code.

Make pipeline use getShadowTarget/releaseShadowTarget consistently.
---
 .../shaders/class1/windlight/atmosphericsF.glsl    | 15 ++------------
 .../shaders/class1/windlight/transportF.glsl       | 23 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
index c1cc3679a7..2b8cf9d8df 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
@@ -23,21 +23,10 @@
  * $/LicenseInfo$
  */
  
-vec3 atmosFragAmbient(vec3 light, vec3 sunlit)
-{
-    /* stub function for fallback compatibility on class1 hardware */
-    return light;
-}
-
 vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten)
 {
-    /* stub function for fallback compatibility on class1 hardware */
-	return light;
-}
-
-vec3 atmosFragAffectDirectionalLight(float light, vec3 sunlit)
-{
-   return light * sunlit;
+	/* stub function for fallback compatibility on class1 hardware */
+   return light;
 }
 
 vec3 atmosLighting(vec3 light)
diff --git a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
index ebce9ea91d..e2b391cb7a 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file transportF.glsl
+ * @file class1/windlight/transportF.glsl
  *
  * $LicenseInfo:firstyear=2005&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -25,6 +25,24 @@
 
 uniform int no_atmo;
 
+vec3 atmosTransportFrag(vec3 light, vec3 additive, vec3 atten)
+{
+    /* stub function for fallback compatibility on class1 hardware */
+	return light;
+}
+
+vec3 fullbrightAtmosTransportFrag(vec3 light, vec3 additive, vec3 atten)
+{
+    /* stub function for fallback compatibility on class1 hardware */
+    return light;
+}
+
+vec3 fullbrightShinyAtmosTransportFrag(vec3 light, vec3 atten, vec3 additive)
+{
+    /* stub function for fallback compatibility on class1 hardware */
+    return light;
+}
+
 vec3 atmosTransport(vec3 light)
 {
 	/* stub function for fallback compatibility on class1 hardware */
@@ -33,11 +51,12 @@ vec3 atmosTransport(vec3 light)
 
 vec3 fullbrightAtmosTransport(vec3 light)
 {
+    /* stub function for fallback compatibility on class1 hardware */
     return light;
 }
 
 vec3 fullbrightShinyAtmosTransport(vec3 light)
 {
+    /* stub function for fallback compatibility on class1 hardware */
     return light;
 }
-
-- 
cgit v1.2.3


From db270df7cc00c1e2519749831e7e98c2c10e3ee6 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 9 Nov 2018 18:31:29 +0000
Subject: Back out changes causing broken shadows and other render shenanigans.

---
 .../shaders/class1/windlight/atmosphericsF.glsl           | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
index 2b8cf9d8df..c1cc3679a7 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
@@ -23,10 +23,21 @@
  * $/LicenseInfo$
  */
  
+vec3 atmosFragAmbient(vec3 light, vec3 sunlit)
+{
+    /* stub function for fallback compatibility on class1 hardware */
+    return light;
+}
+
 vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten)
 {
-	/* stub function for fallback compatibility on class1 hardware */
-   return light;
+    /* stub function for fallback compatibility on class1 hardware */
+	return light;
+}
+
+vec3 atmosFragAffectDirectionalLight(float light, vec3 sunlit)
+{
+   return light * sunlit;
 }
 
 vec3 atmosLighting(vec3 light)
-- 
cgit v1.2.3


From a49e2b604e6b505e083e24b10e39053196d917c1 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 12 Nov 2018 15:54:53 -0800
Subject: SL-10044 SL-10045

Fix class 1 and 2 transport/gamma funcs and made usage consistent across all shaders.

Fix class1\environment\waterV reverting to old d1/d2 names for wave directions.
---
 .../shaders/class1/windlight/atmosphericsHelpersF.glsl       |  6 ++++++
 .../shaders/class1/windlight/atmosphericsHelpersV.glsl       | 12 ++++++++++++
 .../app_settings/shaders/class1/windlight/gammaF.glsl        |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
index 9e5893d32a..c16e3d50a2 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
@@ -41,3 +41,9 @@ vec3 atmosGetDiffuseSunlightColor()
 	return sunlight_color.rgb;
 }
 
+vec3 scaleDownLight(vec3 light)
+{
+	/* stub function for fallback compatibility on class1 hardware */
+	return light;
+}
+
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
index 01f19087ff..89b6a52909 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
@@ -41,3 +41,15 @@ vec3 atmosGetDiffuseSunlightColor()
 	return sunlight_color.rgb;
 }
 
+vec3 scaleDownLight(vec3 light)
+{
+	/* stub function for fallback compatibility on class1 hardware */
+	return light;
+}
+
+vec3 scaleUpLight(vec3 light)
+{
+	/* stub function for fallback compatibility on class1 hardware */
+	return light;
+}
+
diff --git a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
index 768d93f005..667301443a 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
@@ -39,7 +39,7 @@ vec3 scaleSoftClip(vec3 light)
 	return light;
 }
 
-vec3 fullbrightScaleSoftClipFrag(vec3 light)
+vec3 fullbrightScaleSoftClipFrag(vec3 light, vec3 additive, vec3 atten)
 {
 	// For compatibility with lower cards. Do nothing
 	return light;
-- 
cgit v1.2.3


From 30606a564db3dd3755ed6dc1c30cdacc8c35b40b Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 19 Nov 2018 10:49:14 -0800
Subject: SL-10032

Plug more holes through which env ambient terms were finding their way into lighting calcs for HUDs.
Fix up mismatched indenting (tabs v spaces) on several shaders.
---
 .../shaders/class1/windlight/atmosphericsF.glsl          |  6 +++---
 .../shaders/class1/windlight/atmosphericsHelpersF.glsl   | 12 +++++++-----
 .../shaders/class1/windlight/atmosphericsHelpersV.glsl   | 16 +++++++++-------
 .../shaders/class1/windlight/atmosphericsV.glsl          |  4 ++--
 4 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
index c1cc3679a7..8b7c4f2ecf 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
@@ -32,7 +32,7 @@ vec3 atmosFragAmbient(vec3 light, vec3 sunlit)
 vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten)
 {
     /* stub function for fallback compatibility on class1 hardware */
-	return light;
+    return light;
 }
 
 vec3 atmosFragAffectDirectionalLight(float light, vec3 sunlit)
@@ -43,11 +43,11 @@ vec3 atmosFragAffectDirectionalLight(float light, vec3 sunlit)
 vec3 atmosLighting(vec3 light)
 {
     /* stub function for fallback compatibility on class1 hardware */
-	return light;
+    return light;
 }
 
 void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 atten, out vec3 additive)
 {
-	/* stub function for fallback compatibility on class1 hardware */
+    /* stub function for fallback compatibility on class1 hardware */
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
index c16e3d50a2..10407eeb02 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
@@ -25,25 +25,27 @@
  
 uniform vec4 sunlight_color;
 uniform vec4 light_ambient;
+uniform int no_atmo;
 
 vec3 atmosAmbient(vec3 light)
 {
-	return light + light_ambient.rgb;
+    if (no_atmo == 1) return light + vec3(0.66);
+    return light + light_ambient.rgb;
 }
 
 vec3 atmosAffectDirectionalLight(float lightIntensity)
 {
-	return sunlight_color.rgb * lightIntensity;
+    return sunlight_color.rgb * lightIntensity;
 }
 
 vec3 atmosGetDiffuseSunlightColor()
 {
-	return sunlight_color.rgb;
+    return sunlight_color.rgb;
 }
 
 vec3 scaleDownLight(vec3 light)
 {
-	/* stub function for fallback compatibility on class1 hardware */
-	return light;
+    /* stub function for fallback compatibility on class1 hardware */
+    return light;
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
index 89b6a52909..14034bccae 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
@@ -25,31 +25,33 @@
  
 uniform vec4 sunlight_color;
 uniform vec4 light_ambient;
+uniform int no_atmo;
 
 vec3 atmosAmbient(vec3 light)
 {
-	return light + light_ambient.rgb;
+    if (no_atmo == 1) return light + vec3(0.66);
+    return light + light_ambient.rgb;
 }
 
 vec3 atmosAffectDirectionalLight(float lightIntensity)
 {
-	return sunlight_color.rgb * lightIntensity;
+    return sunlight_color.rgb * lightIntensity;
 }
 
 vec3 atmosGetDiffuseSunlightColor()
 {
-	return sunlight_color.rgb;
+    return sunlight_color.rgb;
 }
 
 vec3 scaleDownLight(vec3 light)
 {
-	/* stub function for fallback compatibility on class1 hardware */
-	return light;
+    /* stub function for fallback compatibility on class1 hardware */
+    return light;
 }
 
 vec3 scaleUpLight(vec3 light)
 {
-	/* stub function for fallback compatibility on class1 hardware */
-	return light;
+    /* stub function for fallback compatibility on class1 hardware */
+    return light;
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl
index 76d7d5059d..b749e1a7a2 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl
@@ -29,7 +29,7 @@ void setPositionEye(vec3 v);
 
 void calcAtmospherics(vec3 inPositionEye)
 {
-	/* stub function for fallback compatibility on class1 hardware */
-	setPositionEye(inPositionEye);
+    /* stub function for fallback compatibility on class1 hardware */
+    setPositionEye(inPositionEye);
 }
 
-- 
cgit v1.2.3


From 26c1430a04de585c1823569b60dc99abc798231b Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 5 Dec 2018 13:08:06 -0800
Subject: Shader cleanup and consolidation of use of sRGB conversion funcs.

---
 indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
index 8b7c4f2ecf..4f0e2a6cb6 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file atmosphericsF.glsl
+ * @file class1\windlight\atmosphericsF.glsl
  *
  * $LicenseInfo:firstyear=2005&license=viewerlgpl$
  * Second Life Viewer Source Code
-- 
cgit v1.2.3


From 2312efbf3ae09013bc86a2378bed43a743f2df3e Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 4 Jan 2019 10:17:09 -0800
Subject: Add new shaders for generating shadows from clouds.

Add new class3 shadow shaders for VSM shadows.

Add disabled shadow pass in WLSky for using above.
---
 .../shaders/class1/windlight/cloudShadowF.glsl     | 121 +++++++++++++++++++++
 .../shaders/class1/windlight/cloudShadowV.glsl     |  61 +++++++++++
 2 files changed, 182 insertions(+)
 create mode 100644 indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
 create mode 100644 indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
new file mode 100644
index 0000000000..fa6926b007
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
@@ -0,0 +1,121 @@
+/** 
+ * @file class3/deferred/cloudsF.glsl
+ *
+ * $LicenseInfo:firstyear=2005&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2005, 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$
+ */
+ 
+#ifdef DEFINE_GL_FRAGCOLOR
+out vec4 frag_color;
+#else
+#define frag_color gl_FragColor
+#endif
+
+uniform sampler2D diffuseMap;
+
+VARYING vec4 pos;
+VARYING float target_pos_x;
+VARYING float vary_CloudDensity;
+VARYING vec2 vary_texcoord0;
+VARYING vec2 vary_texcoord1;
+VARYING vec2 vary_texcoord2;
+VARYING vec2 vary_texcoord3;
+
+uniform sampler2D cloud_noise_texture;
+uniform sampler2D cloud_noise_texture_next;
+uniform float blend_factor;
+uniform vec4 cloud_pos_density1;
+uniform vec4 cloud_pos_density2;
+uniform vec4 sunlight_color;
+uniform vec4 cloud_color;
+uniform float cloud_shadow;
+uniform float cloud_scale;
+uniform float cloud_variance;
+uniform vec3 ambient;
+uniform vec3 camPosLocal;
+uniform vec3 sun_dir;
+uniform float sun_size;
+uniform float far_z;
+
+#if !DEPTH_CLAMP
+VARYING vec4 post_pos;
+#endif
+
+vec4 cloudNoise(vec2 uv)
+{
+   vec4 a = texture2D(cloud_noise_texture, uv);
+   vec4 b = texture2D(cloud_noise_texture_next, uv);
+   vec4 cloud_noise_sample = mix(a, b, blend_factor);
+   return normalize(cloud_noise_sample);
+}
+
+void main()
+{
+	// Set variables
+	vec2 uv1 = vary_texcoord0.xy;
+	vec2 uv2 = vary_texcoord1.xy;
+	vec2 uv3 = vary_texcoord2.xy;
+	float cloudDensity = 2.0 * (cloud_shadow - 0.25);
+
+	vec2 uv4 = vary_texcoord3.xy;
+
+    vec2 disturbance  = vec2(cloudNoise(uv1 / 8.0f).x, cloudNoise((uv3 + uv1) / 16.0f).x) * cloud_variance * (1.0f - cloud_scale * 0.25f);
+    vec2 disturbance2 = vec2(cloudNoise((uv1 + uv3) / 4.0f).x, cloudNoise((uv4 + uv2) / 8.0f).x) * cloud_variance * (1.0f - cloud_scale * 0.25f);
+
+	// Offset texture coords
+	uv1 += cloud_pos_density1.xy + (disturbance * 0.02);	//large texture, visible density
+	uv2 += cloud_pos_density1.xy;	//large texture, self shadow
+	uv3 += cloud_pos_density2.xy;	//small texture, visible density
+	uv4 += cloud_pos_density2.xy;	//small texture, self shadow
+
+    float density_variance = min(1.0, (disturbance.x* 2.0 + disturbance.y* 2.0 + disturbance2.x + disturbance2.y));
+
+    cloudDensity *= 1.0 - (density_variance * density_variance);
+
+	// Compute alpha1, the main cloud opacity
+	float alpha1 = (cloudNoise(uv1).x - 0.5) + (cloudNoise(uv3).x - 0.5) * cloud_pos_density2.z;
+	alpha1 = min(max(alpha1 + cloudDensity, 0.) * 10 * cloud_pos_density1.z, 1.);
+
+	// And smooth
+	alpha1 = 1. - alpha1 * alpha1;
+	alpha1 = 1. - alpha1 * alpha1;	
+
+    if (alpha1 < 0.001f)
+    {
+        discard;
+    }
+
+	// Compute alpha2, for self shadowing effect
+	// (1 - alpha2) will later be used as percentage of incoming sunlight
+	float alpha2 = (cloudNoise(uv2).x - 0.5);
+	alpha2 = min(max(alpha2 + cloudDensity, 0.) * 2.5 * cloud_pos_density1.z, 1.);
+
+	// And smooth
+	alpha2 = 1. - alpha2;
+	alpha2 = 1. - alpha2 * alpha2;	
+
+    frag_color = vec4(alpha1, alpha1, alpha1, 1);
+
+#if !DEPTH_CLAMP
+	gl_FragDepth = max(post_pos.z/post_pos.w*0.5+0.5, 0.0);
+#endif
+
+}
diff --git a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl
new file mode 100644
index 0000000000..52164e7b80
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl
@@ -0,0 +1,61 @@
+/** 
+ * @file cloudShadowV.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$
+ */
+
+uniform mat4 texture_matrix0;
+uniform mat4 modelview_projection_matrix;
+uniform float shadow_target_width;
+
+ATTRIBUTE vec3 position;
+ATTRIBUTE vec4 diffuse_color;
+ATTRIBUTE vec2 texcoord0;
+
+#if !DEPTH_CLAMP
+VARYING float pos_zd2;
+#endif
+
+VARYING vec4 pos;
+VARYING float target_pos_x;
+VARYING vec2 vary_texcoord0;
+
+void passTextureIndex();
+
+void main()
+{
+	//transform vertex
+	vec4 pre_pos = vec4(position.xyz, 1.0);
+	pos = modelview_projection_matrix * pre_pos;
+	target_pos_x = 0.5 * (shadow_target_width - 1.0) * pos.x;
+
+#if !DEPTH_CLAMP
+	pos_zd2 = pos.z * 0.5;
+	gl_Position = vec4(pos.x, pos.y, pos.w*0.5, pos.w);
+#else
+	gl_Position = pos;
+#endif
+	
+	passTextureIndex();
+
+	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
+}
-- 
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.
---
 indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl | 4 ++--
 indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
index fa6926b007..d93baa03c6 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
@@ -55,7 +55,7 @@ uniform vec3 sun_dir;
 uniform float sun_size;
 uniform float far_z;
 
-#if !DEPTH_CLAMP
+#if !defined(DEPTH_CLAMP)
 VARYING vec4 post_pos;
 #endif
 
@@ -114,7 +114,7 @@ void main()
 
     frag_color = vec4(alpha1, alpha1, alpha1, 1);
 
-#if !DEPTH_CLAMP
+#if !defined(DEPTH_CLAMP)
 	gl_FragDepth = max(post_pos.z/post_pos.w*0.5+0.5, 0.0);
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl
index 52164e7b80..1c2fbaf25d 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl
@@ -31,7 +31,7 @@ ATTRIBUTE vec3 position;
 ATTRIBUTE vec4 diffuse_color;
 ATTRIBUTE vec2 texcoord0;
 
-#if !DEPTH_CLAMP
+#if !defined(DEPTH_CLAMP)
 VARYING float pos_zd2;
 #endif
 
@@ -48,7 +48,7 @@ void main()
 	pos = modelview_projection_matrix * pre_pos;
 	target_pos_x = 0.5 * (shadow_target_width - 1.0) * pos.x;
 
-#if !DEPTH_CLAMP
+#if !defined(DEPTH_CLAMP)
 	pos_zd2 = pos.z * 0.5;
 	gl_Position = vec4(pos.x, pos.y, pos.w*0.5, pos.w);
 #else
-- 
cgit v1.2.3


From 966dc7fc8fb1fade861e8070e9c5fbbfe4d0cb45 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 24 Jan 2019 14:54:11 -0800
Subject: SL-10276 SL-9851

Fix cloud shaders to ignore clouds when cloud_scale is 0.

Fix creation of heavenly body geo to avoid degenerate vector math
and not randomly flip orientation when crossing zenith.

Add sun_up_factor to eliminate sun glow around moon when sun is down.
---
 .../shaders/class1/windlight/cloudShadowF.glsl     | 93 ++++++++++++----------
 1 file changed, 50 insertions(+), 43 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
index d93baa03c6..69a3c59cb3 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
@@ -69,53 +69,60 @@ vec4 cloudNoise(vec2 uv)
 
 void main()
 {
-	// Set variables
-	vec2 uv1 = vary_texcoord0.xy;
-	vec2 uv2 = vary_texcoord1.xy;
-	vec2 uv3 = vary_texcoord2.xy;
-	float cloudDensity = 2.0 * (cloud_shadow - 0.25);
-
-	vec2 uv4 = vary_texcoord3.xy;
-
-    vec2 disturbance  = vec2(cloudNoise(uv1 / 8.0f).x, cloudNoise((uv3 + uv1) / 16.0f).x) * cloud_variance * (1.0f - cloud_scale * 0.25f);
-    vec2 disturbance2 = vec2(cloudNoise((uv1 + uv3) / 4.0f).x, cloudNoise((uv4 + uv2) / 8.0f).x) * cloud_variance * (1.0f - cloud_scale * 0.25f);
-
-	// Offset texture coords
-	uv1 += cloud_pos_density1.xy + (disturbance * 0.02);	//large texture, visible density
-	uv2 += cloud_pos_density1.xy;	//large texture, self shadow
-	uv3 += cloud_pos_density2.xy;	//small texture, visible density
-	uv4 += cloud_pos_density2.xy;	//small texture, self shadow
-
-    float density_variance = min(1.0, (disturbance.x* 2.0 + disturbance.y* 2.0 + disturbance2.x + disturbance2.y));
-
-    cloudDensity *= 1.0 - (density_variance * density_variance);
-
-	// Compute alpha1, the main cloud opacity
-	float alpha1 = (cloudNoise(uv1).x - 0.5) + (cloudNoise(uv3).x - 0.5) * cloud_pos_density2.z;
-	alpha1 = min(max(alpha1 + cloudDensity, 0.) * 10 * cloud_pos_density1.z, 1.);
-
-	// And smooth
-	alpha1 = 1. - alpha1 * alpha1;
-	alpha1 = 1. - alpha1 * alpha1;	
-
-    if (alpha1 < 0.001f)
+    if (cloud_scale >= 0.0001)
     {
-        discard;
+        // Set variables
+        vec2 uv1 = vary_texcoord0.xy;
+        vec2 uv2 = vary_texcoord1.xy;
+        vec2 uv3 = vary_texcoord2.xy;
+        float cloudDensity = 2.0 * (cloud_shadow - 0.25);
+    
+        vec2 uv4 = vary_texcoord3.xy;
+    
+        vec2 disturbance  = vec2(cloudNoise(uv1 / 8.0f).x, cloudNoise((uv3 + uv1) / 16.0f).x) * cloud_variance * (1.0f - cloud_scale * 0.25f);
+        vec2 disturbance2 = vec2(cloudNoise((uv1 + uv3) / 4.0f).x, cloudNoise((uv4 + uv2) / 8.0f).x) * cloud_variance * (1.0f - cloud_scale * 0.25f);
+    
+        // Offset texture coords
+        uv1 += cloud_pos_density1.xy + (disturbance * 0.02);    //large texture, visible density
+        uv2 += cloud_pos_density1.xy;   //large texture, self shadow
+        uv3 += cloud_pos_density2.xy;   //small texture, visible density
+        uv4 += cloud_pos_density2.xy;   //small texture, self shadow
+    
+        float density_variance = min(1.0, (disturbance.x* 2.0 + disturbance.y* 2.0 + disturbance2.x + disturbance2.y));
+    
+        cloudDensity *= 1.0 - (density_variance * density_variance);
+    
+        // Compute alpha1, the main cloud opacity
+        float alpha1 = (cloudNoise(uv1).x - 0.5) + (cloudNoise(uv3).x - 0.5) * cloud_pos_density2.z;
+        alpha1 = min(max(alpha1 + cloudDensity, 0.) * 10 * cloud_pos_density1.z, 1.);
+    
+        // And smooth
+        alpha1 = 1. - alpha1 * alpha1;
+        alpha1 = 1. - alpha1 * alpha1;  
+    
+        if (alpha1 < 0.001f)
+        {
+            discard;
+        }
+    
+        // Compute alpha2, for self shadowing effect
+        // (1 - alpha2) will later be used as percentage of incoming sunlight
+        float alpha2 = (cloudNoise(uv2).x - 0.5);
+        alpha2 = min(max(alpha2 + cloudDensity, 0.) * 2.5 * cloud_pos_density1.z, 1.);
+    
+        // And smooth
+        alpha2 = 1. - alpha2;
+        alpha2 = 1. - alpha2 * alpha2;  
+    
+        frag_color = vec4(alpha1, alpha1, alpha1, 1);
+    }
+    else
+    {
+        frag_color = vec4(1);
     }
-
-	// Compute alpha2, for self shadowing effect
-	// (1 - alpha2) will later be used as percentage of incoming sunlight
-	float alpha2 = (cloudNoise(uv2).x - 0.5);
-	alpha2 = min(max(alpha2 + cloudDensity, 0.) * 2.5 * cloud_pos_density1.z, 1.);
-
-	// And smooth
-	alpha2 = 1. - alpha2;
-	alpha2 = 1. - alpha2 * alpha2;	
-
-    frag_color = vec4(alpha1, alpha1, alpha1, 1);
 
 #if !defined(DEPTH_CLAMP)
-	gl_FragDepth = max(post_pos.z/post_pos.w*0.5+0.5, 0.0);
+    gl_FragDepth = max(post_pos.z/post_pos.w*0.5+0.5, 0.0);
 #endif
 
 }
-- 
cgit v1.2.3


From 88d4d85711a25772f3659850902e3a395ef2358c Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 25 Jan 2019 10:34:42 -0800
Subject: SL-10303

Modify sun disc shader to better position itself within the sun glow and to
fade as the sun approaches the horizon (to mask where the position difference is greatest).
---
 .../app_settings/shaders/class1/windlight/sunDiscF.glsl    | 11 +++++++----
 .../app_settings/shaders/class1/windlight/sunDiscV.glsl    | 14 ++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
index 3f2375ee4d..668379164d 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
@@ -40,15 +40,18 @@ uniform sampler2D diffuseMap;
 uniform sampler2D altDiffuseMap;
 uniform float blend_factor; // interp factor between sun A/B
 VARYING vec2 vary_texcoord0;
+VARYING float sun_fade;
 
 void main() 
 {
-	vec4 sunA = texture2D(diffuseMap, vary_texcoord0.xy);
-	vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy);
+    vec4 sunA = texture2D(diffuseMap, vary_texcoord0.xy);
+    vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy);
     vec4 c     = mix(sunA, sunB, blend_factor);
+    c.a *= sun_fade;
+
     c.rgb = pow(c.rgb, vec3(0.7f));
-	c.rgb = fullbrightAtmosTransport(c.rgb);
+    c.rgb = fullbrightAtmosTransport(c.rgb);
     c.rgb = fullbrightScaleSoftClip(c.rgb);
-	frag_color = c;
+    frag_color = c;
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
index dd33a4be60..1fa32c3f3b 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
@@ -31,18 +31,20 @@ ATTRIBUTE vec3 position;
 ATTRIBUTE vec2 texcoord0;
 
 VARYING vec2 vary_texcoord0;
+VARYING float sun_fade;
 
 void calcAtmospherics(vec3 eye_pos);
 
 void main()
 {
-	//transform vertex
-	vec4 vert = vec4(position.xyz - vec3(0, 0, 50), 1.0);
-	vec4 pos = modelview_projection_matrix*vert;
+    //transform vertex
+    vec4 vert = vec4(position.xyz, 1.0);
+    vec4 pos = modelview_projection_matrix*vert;
 
-	gl_Position = pos;
-	
+    sun_fade = smoothstep(0.3, 1.0, (position.z + 50) / 512.0f);
+    gl_Position = pos;
+    
     calcAtmospherics(pos.xyz);
 
-	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
+    vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
 }
-- 
cgit v1.2.3


From 431a26c118ec0dea154a2fb2c93ae96ae41b3d7b Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 25 Jan 2019 16:29:05 -0800
Subject: SL-10303, SL-10414

Fix positioning of sun/moon discs w.r.t atmo haze glow.

Disable killing glow when sun is not up.
---
 .../app_settings/shaders/class1/windlight/moonV.glsl    | 17 +++++++++--------
 .../app_settings/shaders/class1/windlight/sunDiscV.glsl |  3 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
index aaa6768ed7..1c43a7332e 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
@@ -36,13 +36,14 @@ VARYING vec2 vary_texcoord0;
 
 void main()
 {
-	//transform vertex
-	vec4 vert = vec4(position.xyz, 1.0);
-	vec4 pos = (modelview_matrix * vert);
+    //transform vertex
+    vec3 offset = vec3(0, 0, 50);
+    vec4 vert = vec4(position.xyz - offset, 1.0);
+    vec4 pos = (modelview_matrix * vert);
 
-	gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0);
-	
-	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
-	
-	calcAtmospherics(pos.xyz);
+    gl_Position = modelview_projection_matrix*vert;
+    
+    vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
+    
+    calcAtmospherics(pos.xyz);
 }
diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
index 1fa32c3f3b..ca116628f1 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
@@ -38,7 +38,8 @@ void calcAtmospherics(vec3 eye_pos);
 void main()
 {
     //transform vertex
-    vec4 vert = vec4(position.xyz, 1.0);
+    vec3 offset = vec3(0, 0, 50);
+    vec4 vert = vec4(position.xyz - offset, 1.0);
     vec4 pos = modelview_projection_matrix*vert;
 
     sun_fade = smoothstep(0.3, 1.0, (position.z + 50) / 512.0f);
-- 
cgit v1.2.3


From 8890c3238ab4ae8bbf1bc123284f9c6d4db4f9d6 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 6 Feb 2019 16:42:23 -0800
Subject: SL-10478

Fix side-effects of having both sun and moon as potential directional light contributors.
We pass an int to the shader indicating which to prefer instead of making per-pixel decisions
and pass the moonlight color/di independently.

Obsolete llsettingssky fade color which was unused elsewhere and cached for no reason.
---
 indra/newview/app_settings/shaders/class1/windlight/moonF.glsl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
index b66b56e0fb..947c301110 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
@@ -35,6 +35,7 @@ out vec4 frag_color;
 
 uniform vec4 color;
 uniform vec4 sunlight_color;
+uniform vec4 moonlight_color;
 uniform vec3 lumWeights;
 uniform float moon_brightness;
 uniform float minLuminance;
@@ -45,8 +46,8 @@ VARYING vec2 vary_texcoord0;
 
 void main() 
 {
-	vec4 moonA = texture2D(diffuseMap, vary_texcoord0.xy);
-	vec4 moonB = texture2D(altDiffuseMap, vary_texcoord0.xy);
+    vec4 moonA = texture2D(diffuseMap, vary_texcoord0.xy);
+    vec4 moonB = texture2D(altDiffuseMap, vary_texcoord0.xy);
     vec4 c     = mix(moonA, moonB, blend_factor);
 
     // mix factor which blends when sunlight is brighter
@@ -55,8 +56,9 @@ void main()
     float mix = 1.0f - dot(normalize(sunlight_color.rgb), luma_weights);
 
     vec3 exp = vec3(1.0 - mix * moon_brightness) * 2.0 - 1.0;
-	c.rgb = pow(c.rgb, exp);
+    c.rgb = pow(c.rgb, exp);
+    //c.rgb *= moonlight_color.rgb;
 
-	frag_color = vec4(c.rgb, c.a);
+    frag_color = vec4(c.rgb, c.a);
 }
 
-- 
cgit v1.2.3


From 5cd188840d968731047aa89459ff63f605709c6e Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 25 Feb 2019 12:14:59 -0800
Subject: SL-9806

Remove fade effect on sun disc as it nears horizon (stars poke through).
---
 indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
index 668379164d..d85ce004a5 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
@@ -47,7 +47,9 @@ void main()
     vec4 sunA = texture2D(diffuseMap, vary_texcoord0.xy);
     vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy);
     vec4 c     = mix(sunA, sunB, blend_factor);
-    c.a *= sun_fade;
+
+// SL-9806 stars poke through
+//    c.a *= sun_fade;
 
     c.rgb = pow(c.rgb, vec3(0.7f));
     c.rgb = fullbrightAtmosTransport(c.rgb);
-- 
cgit v1.2.3


From c1d2416826406631807f153e7de9d2b790b0caa5 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 28 Feb 2019 14:06:19 -0800
Subject: EEP performance WIP

Mods to improve alpha obj render performance.

Removes hacky fix for HUD elements getting atmospherics.

Re-orders rendering of glow to remove ~10ms/frame of shader re-re-rebinding.

Fix up default classes and basic shader loading (remove unused shared modules).
---
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl     | 2 --
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl     | 2 --
 indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl         | 1 -
 indra/newview/app_settings/shaders/class1/windlight/transportF.glsl     | 2 --
 4 files changed, 7 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
index 10407eeb02..3572331d74 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
@@ -25,11 +25,9 @@
  
 uniform vec4 sunlight_color;
 uniform vec4 light_ambient;
-uniform int no_atmo;
 
 vec3 atmosAmbient(vec3 light)
 {
-    if (no_atmo == 1) return light + vec3(0.66);
     return light + light_ambient.rgb;
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
index 14034bccae..7e4855b7c6 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
@@ -25,11 +25,9 @@
  
 uniform vec4 sunlight_color;
 uniform vec4 light_ambient;
-uniform int no_atmo;
 
 vec3 atmosAmbient(vec3 light)
 {
-    if (no_atmo == 1) return light + vec3(0.66);
     return light + light_ambient.rgb;
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
index 667301443a..9917ba8d3b 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
@@ -23,7 +23,6 @@
  * $/LicenseInfo$
  */
  
-uniform int no_atmo;
 uniform vec4 gamma;
 
 vec3 scaleSoftClipFrag(vec3 light)
diff --git a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
index e2b391cb7a..f61194db6d 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
@@ -23,8 +23,6 @@
  * $/LicenseInfo$
  */
 
-uniform int no_atmo;
-
 vec3 atmosTransportFrag(vec3 light, vec3 additive, vec3 atten)
 {
     /* stub function for fallback compatibility on class1 hardware */
-- 
cgit v1.2.3


From 4c3050a3953153aa8753fc10706ad2ef464f3e3d Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Sun, 3 Mar 2019 10:42:19 -0800
Subject: SL-10664, SL-10666

Fix up culling issues from perf work and fix Depth of Field rendering to get depth values properly.

Baseline for performance work.
---
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl     | 2 ++
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl     | 2 ++
 indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl         | 1 +
 indra/newview/app_settings/shaders/class1/windlight/transportF.glsl     | 2 ++
 4 files changed, 7 insertions(+)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
index 3572331d74..10407eeb02 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
@@ -25,9 +25,11 @@
  
 uniform vec4 sunlight_color;
 uniform vec4 light_ambient;
+uniform int no_atmo;
 
 vec3 atmosAmbient(vec3 light)
 {
+    if (no_atmo == 1) return light + vec3(0.66);
     return light + light_ambient.rgb;
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
index 7e4855b7c6..14034bccae 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
@@ -25,9 +25,11 @@
  
 uniform vec4 sunlight_color;
 uniform vec4 light_ambient;
+uniform int no_atmo;
 
 vec3 atmosAmbient(vec3 light)
 {
+    if (no_atmo == 1) return light + vec3(0.66);
     return light + light_ambient.rgb;
 }
 
diff --git a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
index 9917ba8d3b..667301443a 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
@@ -23,6 +23,7 @@
  * $/LicenseInfo$
  */
  
+uniform int no_atmo;
 uniform vec4 gamma;
 
 vec3 scaleSoftClipFrag(vec3 light)
diff --git a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
index f61194db6d..e2b391cb7a 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
@@ -23,6 +23,8 @@
  * $/LicenseInfo$
  */
 
+uniform int no_atmo;
+
 vec3 atmosTransportFrag(vec3 light, vec3 additive, vec3 atten)
 {
     /* stub function for fallback compatibility on class1 hardware */
-- 
cgit v1.2.3


From 823172cab99c55b1c26b523d7dd63a99ece9f6cb Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 28 Mar 2019 14:18:59 -0700
Subject: SL-10831

Make moon brightness env setting affect moon diffuse/ambient color combo so it affects in-world lighting.

Adjust how the moon brightness affects the moon disc texture rendering (washes out less).
---
 indra/newview/app_settings/shaders/class1/windlight/moonF.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
index 947c301110..c8bbdd109d 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
@@ -52,7 +52,7 @@ void main()
 
     // mix factor which blends when sunlight is brighter
     // and shows true moon color at night
-    vec3 luma_weights = vec3(0.2, 0.3, 0.2);
+    vec3 luma_weights = vec3(0.3, 0.5, 0.3);
     float mix = 1.0f - dot(normalize(sunlight_color.rgb), luma_weights);
 
     vec3 exp = vec3(1.0 - mix * moon_brightness) * 2.0 - 1.0;
-- 
cgit v1.2.3


From dcd8117b85f45886f78a1a2e9756cb1709d6572a Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Tue, 9 Apr 2019 22:35:40 -0700
Subject: First stab at moving atmospheric var calcs to its own utility shader.
 Still some work to go here.  Largely related to how certain values (i.e.,
 SSAO mix values) are supplied.  But so far, so good.

--HG--
branch : OPEN-340
---
 .../class1/windlight/atmosphericsFuncs.glsl        | 116 +++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
new file mode 100644
index 0000000000..2854fb8139
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -0,0 +1,116 @@
+uniform vec4 gamma;
+uniform vec4 lightnorm;
+uniform vec4 sunlight_color;
+uniform vec4 moonlight_color;
+uniform int sun_up_factor;
+uniform vec4 ambient;
+uniform vec4 blue_horizon;
+uniform vec4 blue_density;
+uniform float haze_horizon;
+uniform float haze_density;
+uniform float cloud_shadow;
+uniform float density_multiplier;
+uniform float distance_multiplier;
+uniform float max_y;
+uniform vec4 glow;
+uniform float scene_light_strength;
+uniform mat3 ssao_effect_mat;
+uniform int no_atmo;
+uniform float sun_moon_glow_factor;
+
+vec3 nothing() {
+    return vec3(0, 0, 0);
+}
+
+void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
+
+    vec3 P = inPositionEye;
+   
+    //(TERRAIN) limit altitude
+    if (P.y > max_y) P *= (max_y / P.y);
+    if (P.y < -max_y) P *= (-max_y / P.y); 
+
+    vec3 tmpLightnorm = lightnorm.xyz;
+
+    vec3 Pn = normalize(P);
+    float Plen = length(P);
+
+    vec4 temp1 = vec4(0);
+    vec3 temp2 = vec3(0);
+    vec4 blue_weight;
+    vec4 haze_weight;
+    vec4 sunlight = (sun_up_factor == 1) ? sunlight_color : moonlight_color;
+    vec4 light_atten;
+
+    //sunlight attenuation effect (hue and brightness) due to atmosphere
+    //this is used later for sunlight modulation at various altitudes
+    light_atten = (blue_density + vec4(haze_density * 0.25)) * (density_multiplier * max_y);
+        //I had thought blue_density and haze_density should have equal weighting,
+        //but attenuation due to haze_density tends to seem too strong
+
+    temp1 = blue_density + vec4(haze_density);
+    blue_weight = blue_density / temp1;
+    haze_weight = vec4(haze_density) / temp1;
+
+    //(TERRAIN) compute sunlight from lightnorm only (for short rays like terrain)
+    temp2.y = max(0.0, tmpLightnorm.y);
+    if (temp2.y > 0.001f)
+    {
+        temp2.y = 1. / temp2.y;
+    }
+    temp2.y = max(0.001f, temp2.y);
+    sunlight *= exp(-light_atten * temp2.y);
+
+    // main atmospheric scattering line integral
+    temp2.z = Plen * density_multiplier;
+
+    // Transparency (-> temp1)
+    // ATI Bugfix -- can't store temp1*temp2.z*distance_multiplier in a variable because the ati
+    // compiler gets confused.
+    temp1 = exp(-temp1 * temp2.z * distance_multiplier);
+
+    //final atmosphere attenuation factor
+    atten = temp1.rgb;
+    
+    //compute haze glow
+    //(can use temp2.x as temp because we haven't used it yet)
+    temp2.x = dot(Pn, tmpLightnorm.xyz);
+    temp2.x = 1. - temp2.x;
+        //temp2.x is 0 at the sun and increases away from sun
+    temp2.x = max(temp2.x, .03);    //was glow.y
+        //set a minimum "angle" (smaller glow.y allows tighter, brighter hotspot)
+    temp2.x *= glow.x;
+        //higher glow.x gives dimmer glow (because next step is 1 / "angle")
+    temp2.x = pow(temp2.x, glow.z);
+        //glow.z should be negative, so we're doing a sort of (1 / "angle") function
+
+    //add "minimum anti-solar illumination"
+    temp2.x += .25;
+
+    temp2.x *= sun_moon_glow_factor;
+    
+    //increase ambient when there are more clouds
+    vec4 tmpAmbient = ambient + (vec4(1.) - ambient) * cloud_shadow * 0.5;
+    
+    /*  decrease value and saturation (that in HSV, not HSL) for occluded areas
+     * // for HSV color/geometry used here, see http://gimp-savvy.com/BOOK/index.html?node52.html
+     * // The following line of code performs the equivalent of:
+     * float ambAlpha = tmpAmbient.a;
+     * float ambValue = dot(vec3(tmpAmbient), vec3(0.577)); // projection onto <1/rt(3), 1/rt(3), 1/rt(3)>, the neutral white-black axis
+     * vec3 ambHueSat = vec3(tmpAmbient) - vec3(ambValue);
+     * tmpAmbient = vec4(RenderSSAOEffect.valueFactor * vec3(ambValue) + RenderSSAOEffect.saturationFactor *(1.0 - ambFactor) * ambHueSat, ambAlpha);
+     */
+    tmpAmbient = vec4(mix(ssao_effect_mat * tmpAmbient.rgb, tmpAmbient.rgb, ambFactor), tmpAmbient.a);
+
+    //haze color
+        additive =
+        vec3(blue_horizon * blue_weight * (sunlight*(1.-cloud_shadow) + tmpAmbient)
+      + (haze_horizon * haze_weight) * (sunlight*(1.-cloud_shadow) * temp2.x
+          + tmpAmbient));
+
+    //brightness of surface both sunlight and ambient
+    sunlit = vec3(sunlight.rgb);
+    amblit = vec3(tmpAmbient * .25);
+    additive  = normalize(additive);
+    additive *= vec3(1.0 - exp(-temp2.z * distance_multiplier)) * 0.5;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 08812cbe060e62cb8b61e91bc2f878a74a0015e5 Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Wed, 10 Apr 2019 02:11:07 -0700
Subject: Separate out vertex program objects from fragment program objects and
 use it. Given that mShaderObjects only ever expects one copy of a given
 shader object (leading to lots of "shaderV" and "shaderF"), it made having
 utility shaders a bit more difficult to incorporate. This change makes sure
 the two are separated.  Using this over a multimap largely for readibility.

Also, actually, you know, use this functionality.

--HG--
branch : OPEN-340
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 2854fb8139..a099083883 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -77,7 +77,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     temp2.x = dot(Pn, tmpLightnorm.xyz);
     temp2.x = 1. - temp2.x;
         //temp2.x is 0 at the sun and increases away from sun
-    temp2.x = max(temp2.x, .03);    //was glow.y
+    temp2.x = max(temp2.x, .001);    //was glow.y
         //set a minimum "angle" (smaller glow.y allows tighter, brighter hotspot)
     temp2.x *= glow.x;
         //higher glow.x gives dimmer glow (because next step is 1 / "angle")
@@ -109,8 +109,8 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
           + tmpAmbient));
 
     //brightness of surface both sunlight and ambient
-    sunlit = vec3(sunlight.rgb);
-    amblit = vec3(tmpAmbient * .25);
+    sunlit = sunlight.rgb;
+    amblit = tmpAmbient.rgb * .25;
     additive  = normalize(additive);
     additive *= vec3(1.0 - exp(-temp2.z * distance_multiplier)) * 0.5;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 0b8ff3a8b22ccfdff320acba127ad631823b5644 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 10 Apr 2019 10:55:30 -0700
Subject: Fix missing sentinel in shader file to avoid spurious complaints for
 hg policy hooks.

---
 .../class1/windlight/atmosphericsFuncs.glsl        | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index a099083883..845c45cc07 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -1,3 +1,27 @@
+/** 
+ * @file class1\windlight\atmosphericsFuncs.glsl
+ *
+ * $LicenseInfo:firstyear=2005&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2019, 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$
+ */
 uniform vec4 gamma;
 uniform vec4 lightnorm;
 uniform vec4 sunlight_color;
@@ -113,4 +137,4 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     amblit = tmpAmbient.rgb * .25;
     additive  = normalize(additive);
     additive *= vec3(1.0 - exp(-temp2.z * distance_multiplier)) * 0.5;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 37a7c96f1724332ccddde36bf5095b99af95fe8f Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 15 Apr 2019 09:41:12 -0700
Subject: Fix line-endings on new shader file from contribution.

---
 .../class1/windlight/atmosphericsFuncs.glsl        | 280 ++++++++++-----------
 1 file changed, 140 insertions(+), 140 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 845c45cc07..91760e05bf 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -1,140 +1,140 @@
-/** 
- * @file class1\windlight\atmosphericsFuncs.glsl
- *
- * $LicenseInfo:firstyear=2005&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2019, 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$
- */
-uniform vec4 gamma;
-uniform vec4 lightnorm;
-uniform vec4 sunlight_color;
-uniform vec4 moonlight_color;
-uniform int sun_up_factor;
-uniform vec4 ambient;
-uniform vec4 blue_horizon;
-uniform vec4 blue_density;
-uniform float haze_horizon;
-uniform float haze_density;
-uniform float cloud_shadow;
-uniform float density_multiplier;
-uniform float distance_multiplier;
-uniform float max_y;
-uniform vec4 glow;
-uniform float scene_light_strength;
-uniform mat3 ssao_effect_mat;
-uniform int no_atmo;
-uniform float sun_moon_glow_factor;
-
-vec3 nothing() {
-    return vec3(0, 0, 0);
-}
-
-void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
-
-    vec3 P = inPositionEye;
-   
-    //(TERRAIN) limit altitude
-    if (P.y > max_y) P *= (max_y / P.y);
-    if (P.y < -max_y) P *= (-max_y / P.y); 
-
-    vec3 tmpLightnorm = lightnorm.xyz;
-
-    vec3 Pn = normalize(P);
-    float Plen = length(P);
-
-    vec4 temp1 = vec4(0);
-    vec3 temp2 = vec3(0);
-    vec4 blue_weight;
-    vec4 haze_weight;
-    vec4 sunlight = (sun_up_factor == 1) ? sunlight_color : moonlight_color;
-    vec4 light_atten;
-
-    //sunlight attenuation effect (hue and brightness) due to atmosphere
-    //this is used later for sunlight modulation at various altitudes
-    light_atten = (blue_density + vec4(haze_density * 0.25)) * (density_multiplier * max_y);
-        //I had thought blue_density and haze_density should have equal weighting,
-        //but attenuation due to haze_density tends to seem too strong
-
-    temp1 = blue_density + vec4(haze_density);
-    blue_weight = blue_density / temp1;
-    haze_weight = vec4(haze_density) / temp1;
-
-    //(TERRAIN) compute sunlight from lightnorm only (for short rays like terrain)
-    temp2.y = max(0.0, tmpLightnorm.y);
-    if (temp2.y > 0.001f)
-    {
-        temp2.y = 1. / temp2.y;
-    }
-    temp2.y = max(0.001f, temp2.y);
-    sunlight *= exp(-light_atten * temp2.y);
-
-    // main atmospheric scattering line integral
-    temp2.z = Plen * density_multiplier;
-
-    // Transparency (-> temp1)
-    // ATI Bugfix -- can't store temp1*temp2.z*distance_multiplier in a variable because the ati
-    // compiler gets confused.
-    temp1 = exp(-temp1 * temp2.z * distance_multiplier);
-
-    //final atmosphere attenuation factor
-    atten = temp1.rgb;
-    
-    //compute haze glow
-    //(can use temp2.x as temp because we haven't used it yet)
-    temp2.x = dot(Pn, tmpLightnorm.xyz);
-    temp2.x = 1. - temp2.x;
-        //temp2.x is 0 at the sun and increases away from sun
-    temp2.x = max(temp2.x, .001);    //was glow.y
-        //set a minimum "angle" (smaller glow.y allows tighter, brighter hotspot)
-    temp2.x *= glow.x;
-        //higher glow.x gives dimmer glow (because next step is 1 / "angle")
-    temp2.x = pow(temp2.x, glow.z);
-        //glow.z should be negative, so we're doing a sort of (1 / "angle") function
-
-    //add "minimum anti-solar illumination"
-    temp2.x += .25;
-
-    temp2.x *= sun_moon_glow_factor;
-    
-    //increase ambient when there are more clouds
-    vec4 tmpAmbient = ambient + (vec4(1.) - ambient) * cloud_shadow * 0.5;
-    
-    /*  decrease value and saturation (that in HSV, not HSL) for occluded areas
-     * // for HSV color/geometry used here, see http://gimp-savvy.com/BOOK/index.html?node52.html
-     * // The following line of code performs the equivalent of:
-     * float ambAlpha = tmpAmbient.a;
-     * float ambValue = dot(vec3(tmpAmbient), vec3(0.577)); // projection onto <1/rt(3), 1/rt(3), 1/rt(3)>, the neutral white-black axis
-     * vec3 ambHueSat = vec3(tmpAmbient) - vec3(ambValue);
-     * tmpAmbient = vec4(RenderSSAOEffect.valueFactor * vec3(ambValue) + RenderSSAOEffect.saturationFactor *(1.0 - ambFactor) * ambHueSat, ambAlpha);
-     */
-    tmpAmbient = vec4(mix(ssao_effect_mat * tmpAmbient.rgb, tmpAmbient.rgb, ambFactor), tmpAmbient.a);
-
-    //haze color
-        additive =
-        vec3(blue_horizon * blue_weight * (sunlight*(1.-cloud_shadow) + tmpAmbient)
-      + (haze_horizon * haze_weight) * (sunlight*(1.-cloud_shadow) * temp2.x
-          + tmpAmbient));
-
-    //brightness of surface both sunlight and ambient
-    sunlit = sunlight.rgb;
-    amblit = tmpAmbient.rgb * .25;
-    additive  = normalize(additive);
-    additive *= vec3(1.0 - exp(-temp2.z * distance_multiplier)) * 0.5;
-}
+/** 
+ * @file class1\windlight\atmosphericsFuncs.glsl
+ *
+ * $LicenseInfo:firstyear=2005&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2019, 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$
+ */
+uniform vec4 gamma;
+uniform vec4 lightnorm;
+uniform vec4 sunlight_color;
+uniform vec4 moonlight_color;
+uniform int sun_up_factor;
+uniform vec4 ambient;
+uniform vec4 blue_horizon;
+uniform vec4 blue_density;
+uniform float haze_horizon;
+uniform float haze_density;
+uniform float cloud_shadow;
+uniform float density_multiplier;
+uniform float distance_multiplier;
+uniform float max_y;
+uniform vec4 glow;
+uniform float scene_light_strength;
+uniform mat3 ssao_effect_mat;
+uniform int no_atmo;
+uniform float sun_moon_glow_factor;
+
+vec3 nothing() {
+    return vec3(0, 0, 0);
+}
+
+void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
+
+    vec3 P = inPositionEye;
+   
+    //(TERRAIN) limit altitude
+    if (P.y > max_y) P *= (max_y / P.y);
+    if (P.y < -max_y) P *= (-max_y / P.y); 
+
+    vec3 tmpLightnorm = lightnorm.xyz;
+
+    vec3 Pn = normalize(P);
+    float Plen = length(P);
+
+    vec4 temp1 = vec4(0);
+    vec3 temp2 = vec3(0);
+    vec4 blue_weight;
+    vec4 haze_weight;
+    vec4 sunlight = (sun_up_factor == 1) ? sunlight_color : moonlight_color;
+    vec4 light_atten;
+
+    //sunlight attenuation effect (hue and brightness) due to atmosphere
+    //this is used later for sunlight modulation at various altitudes
+    light_atten = (blue_density + vec4(haze_density * 0.25)) * (density_multiplier * max_y);
+        //I had thought blue_density and haze_density should have equal weighting,
+        //but attenuation due to haze_density tends to seem too strong
+
+    temp1 = blue_density + vec4(haze_density);
+    blue_weight = blue_density / temp1;
+    haze_weight = vec4(haze_density) / temp1;
+
+    //(TERRAIN) compute sunlight from lightnorm only (for short rays like terrain)
+    temp2.y = max(0.0, tmpLightnorm.y);
+    if (temp2.y > 0.001f)
+    {
+        temp2.y = 1. / temp2.y;
+    }
+    temp2.y = max(0.001f, temp2.y);
+    sunlight *= exp(-light_atten * temp2.y);
+
+    // main atmospheric scattering line integral
+    temp2.z = Plen * density_multiplier;
+
+    // Transparency (-> temp1)
+    // ATI Bugfix -- can't store temp1*temp2.z*distance_multiplier in a variable because the ati
+    // compiler gets confused.
+    temp1 = exp(-temp1 * temp2.z * distance_multiplier);
+
+    //final atmosphere attenuation factor
+    atten = temp1.rgb;
+    
+    //compute haze glow
+    //(can use temp2.x as temp because we haven't used it yet)
+    temp2.x = dot(Pn, tmpLightnorm.xyz);
+    temp2.x = 1. - temp2.x;
+        //temp2.x is 0 at the sun and increases away from sun
+    temp2.x = max(temp2.x, .001);    //was glow.y
+        //set a minimum "angle" (smaller glow.y allows tighter, brighter hotspot)
+    temp2.x *= glow.x;
+        //higher glow.x gives dimmer glow (because next step is 1 / "angle")
+    temp2.x = pow(temp2.x, glow.z);
+        //glow.z should be negative, so we're doing a sort of (1 / "angle") function
+
+    //add "minimum anti-solar illumination"
+    temp2.x += .25;
+
+    temp2.x *= sun_moon_glow_factor;
+    
+    //increase ambient when there are more clouds
+    vec4 tmpAmbient = ambient + (vec4(1.) - ambient) * cloud_shadow * 0.5;
+    
+    /*  decrease value and saturation (that in HSV, not HSL) for occluded areas
+     * // for HSV color/geometry used here, see http://gimp-savvy.com/BOOK/index.html?node52.html
+     * // The following line of code performs the equivalent of:
+     * float ambAlpha = tmpAmbient.a;
+     * float ambValue = dot(vec3(tmpAmbient), vec3(0.577)); // projection onto <1/rt(3), 1/rt(3), 1/rt(3)>, the neutral white-black axis
+     * vec3 ambHueSat = vec3(tmpAmbient) - vec3(ambValue);
+     * tmpAmbient = vec4(RenderSSAOEffect.valueFactor * vec3(ambValue) + RenderSSAOEffect.saturationFactor *(1.0 - ambFactor) * ambHueSat, ambAlpha);
+     */
+    tmpAmbient = vec4(mix(ssao_effect_mat * tmpAmbient.rgb, tmpAmbient.rgb, ambFactor), tmpAmbient.a);
+
+    //haze color
+        additive =
+        vec3(blue_horizon * blue_weight * (sunlight*(1.-cloud_shadow) + tmpAmbient)
+      + (haze_horizon * haze_weight) * (sunlight*(1.-cloud_shadow) * temp2.x
+          + tmpAmbient));
+
+    //brightness of surface both sunlight and ambient
+    sunlit = sunlight.rgb;
+    amblit = tmpAmbient.rgb * .25;
+    additive  = normalize(additive);
+    additive *= vec3(1.0 - exp(-temp2.z * distance_multiplier)) * 0.5;
+}
-- 
cgit v1.2.3


From ebf53108cb8b77eb15c8b16f97bee30d6649e020 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 18 Apr 2019 10:55:01 -0700
Subject: SL-10966

Fix use of density and distance multipliers in atmospherics to use original pre-EEP range instead of FS expanded range.

Modify additive calc to restore old behavior (probably reverts fix for "lens flare" bug).
---
 .../shaders/class1/windlight/atmosphericsFuncs.glsl        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 91760e05bf..d503de6f24 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -66,9 +66,12 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     vec4 sunlight = (sun_up_factor == 1) ? sunlight_color : moonlight_color;
     vec4 light_atten;
 
+    float dens_mul = density_multiplier * 0.5; // get back to original pre-EEP range...
+    float dist_mul = distance_multiplier * 0.1; // get back to original pre-EEP range...
+
     //sunlight attenuation effect (hue and brightness) due to atmosphere
     //this is used later for sunlight modulation at various altitudes
-    light_atten = (blue_density + vec4(haze_density * 0.25)) * (density_multiplier * max_y);
+    light_atten = (blue_density + vec4(haze_density * 0.25)) * (dens_mul * max_y);
         //I had thought blue_density and haze_density should have equal weighting,
         //but attenuation due to haze_density tends to seem too strong
 
@@ -86,12 +89,12 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     sunlight *= exp(-light_atten * temp2.y);
 
     // main atmospheric scattering line integral
-    temp2.z = Plen * density_multiplier;
+    temp2.z = Plen * dens_mul / 2.0f; // 2.0 to get range back to what it was pre-EEP...
 
     // Transparency (-> temp1)
-    // ATI Bugfix -- can't store temp1*temp2.z*distance_multiplier in a variable because the ati
+    // ATI Bugfix -- can't store temp1*temp2.z*dist_mul in a variable because the ati
     // compiler gets confused.
-    temp1 = exp(-temp1 * temp2.z * distance_multiplier);
+    temp1 = exp(-temp1 * temp2.z * dist_mul);
 
     //final atmosphere attenuation factor
     atten = temp1.rgb;
@@ -135,6 +138,5 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     //brightness of surface both sunlight and ambient
     sunlit = sunlight.rgb;
     amblit = tmpAmbient.rgb * .25;
-    additive  = normalize(additive);
-    additive *= vec3(1.0 - exp(-temp2.z * distance_multiplier)) * 0.5;
+    additive *= vec3(1.0 - temp1);
 }
-- 
cgit v1.2.3


From 935adb60831166af49a61b4af97526819d54cb23 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 18 Apr 2019 13:07:49 -0700
Subject: SL-10966

Don't re-range density multiplier twice.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index d503de6f24..1d105690d1 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -89,7 +89,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     sunlight *= exp(-light_atten * temp2.y);
 
     // main atmospheric scattering line integral
-    temp2.z = Plen * dens_mul / 2.0f; // 2.0 to get range back to what it was pre-EEP...
+    temp2.z = Plen * dens_mul;
 
     // Transparency (-> temp1)
     // ATI Bugfix -- can't store temp1*temp2.z*dist_mul in a variable because the ati
-- 
cgit v1.2.3


From 3dd5942776a8e3755fa75e01661b343972affbf9 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 19 Apr 2019 07:44:18 -0700
Subject: Add directory names to sentinels in shaders so shaders with same
 filename can be differentiated in nSight while debugging.

---
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl     | 2 +-
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl     | 2 +-
 indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl  | 2 +-
 .../app_settings/shaders/class1/windlight/atmosphericsVarsF.glsl        | 2 +-
 .../app_settings/shaders/class1/windlight/atmosphericsVarsV.glsl        | 2 +-
 .../app_settings/shaders/class1/windlight/atmosphericsVarsWaterF.glsl   | 2 +-
 .../app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl   | 2 +-
 indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl   | 2 +-
 indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl   | 2 +-
 indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl         | 2 +-
 indra/newview/app_settings/shaders/class1/windlight/moonF.glsl          | 2 +-
 indra/newview/app_settings/shaders/class1/windlight/moonV.glsl          | 2 +-
 indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl       | 2 +-
 indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl       | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
index 10407eeb02..06f13b11f2 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file atmosphericsHelpersF.glsl 
+ * @file class1\windlight\atmosphericsHelpersF.glsl 
  *
  * $LicenseInfo:firstyear=2005&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
index 14034bccae..c24df9eaeb 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file atmosphericsHelpersV.glsl 
+ * @file class1\windlight\atmosphericsHelpersV.glsl 
  *
  * $LicenseInfo:firstyear=2005&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl
index b749e1a7a2..20457ad125 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsV.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file atmosphericsV.glsl 
+ * @file class1\windlight\atmosphericsV.glsl 
  *
  * $LicenseInfo:firstyear=2005&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsF.glsl
index 8bdae328bd..a0699affbf 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsF.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file atmosphericVarsF.glsl
+ * @file class1\windlight\atmosphericVarsF.glsl
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsV.glsl
index 8ec9ae617c..bd1d150fc8 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsV.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file atmosphericVarsV.glsl
+ * @file class1\windlight\atmosphericVarsV.glsl
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterF.glsl
index 636d4af006..5dc086ab1e 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterF.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file atmosphericVarsWaterF.glsl
+ * @file class1\windlight\atmosphericVarsWaterF.glsl
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl
index 8afcc20f6d..e59eca265a 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsVarsWaterV.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file atmosphericVarsWaterV.glsl
+ * @file class1\windlight\atmosphericVarsWaterV.glsl
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
index 69a3c59cb3..537d6ebb99 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file class3/deferred/cloudsF.glsl
+ * @file class1/windlight/cloudShadowF.glsl
  *
  * $LicenseInfo:firstyear=2005&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl
index 1c2fbaf25d..09b6004481 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowV.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file cloudShadowV.glsl
+ * @file class1\windlight\cloudShadowV.glsl
  *
  * $LicenseInfo:firstyear=2011&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
index 667301443a..346634af33 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file gammaF.glsl
+ * @file class1\windlight\gammaF.glsl
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
index c8bbdd109d..24f3992e32 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonF.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file moonF.glsl
+ * @file class1\wl\moonF.glsl
  *
  * $LicenseInfo:firstyear=2005&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl b/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
index 1c43a7332e..8cd4b2ef47 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/moonV.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file moonV.glsl
+ * @file class1\wl\moonV.glsl
  *
   * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
index d85ce004a5..b9ae7a0226 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file sunDiscF.glsl
+ * @file class1\wl\sunDiscF.glsl
  *
  * $LicenseInfo:firstyear=2005&license=viewerlgpl$
  * Second Life Viewer Source Code
diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
index ca116628f1..6c0e795f6b 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscV.glsl
@@ -1,5 +1,5 @@
 /** 
- * @file sunDiscV.glsl
+ * @file class1\wl\sunDiscV.glsl
  *
   * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
-- 
cgit v1.2.3


From f30a649f1cd789510b2f4e0b2b2f85043cdfd700 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 19 Apr 2019 08:26:03 -0700
Subject: SL-10967

All paths now use the same atmospheric transport calcs.
---
 .../app_settings/shaders/class1/windlight/transportF.glsl    | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
index e2b391cb7a..79d8d11b32 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
@@ -31,18 +31,6 @@ vec3 atmosTransportFrag(vec3 light, vec3 additive, vec3 atten)
 	return light;
 }
 
-vec3 fullbrightAtmosTransportFrag(vec3 light, vec3 additive, vec3 atten)
-{
-    /* stub function for fallback compatibility on class1 hardware */
-    return light;
-}
-
-vec3 fullbrightShinyAtmosTransportFrag(vec3 light, vec3 atten, vec3 additive)
-{
-    /* stub function for fallback compatibility on class1 hardware */
-    return light;
-}
-
 vec3 atmosTransport(vec3 light)
 {
 	/* stub function for fallback compatibility on class1 hardware */
-- 
cgit v1.2.3


From dd1cc2f3b1df472be405f4b95107972be1ea1a62 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 19 Apr 2019 13:13:50 -0700
Subject: Fix sky and cloud shader usage of density_multiplier (not re-ranged
 from FS to WL).

Remove all refs to now unused calcFragAtmospherics.
---
 .../newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl | 5 -----
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl     | 4 ----
 2 files changed, 9 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
index 4f0e2a6cb6..4e0618e276 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsF.glsl
@@ -46,8 +46,3 @@ vec3 atmosLighting(vec3 light)
     return light;
 }
 
-void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 atten, out vec3 additive)
-{
-    /* stub function for fallback compatibility on class1 hardware */
-}
-
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 1d105690d1..3d05912f49 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -42,10 +42,6 @@ uniform mat3 ssao_effect_mat;
 uniform int no_atmo;
 uniform float sun_moon_glow_factor;
 
-vec3 nothing() {
-    return vec3(0, 0, 0);
-}
-
 void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
 
     vec3 P = inPositionEye;
-- 
cgit v1.2.3


From 4d76ba2d23c22e9a507a0eb7687b3750091b356f Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 22 Apr 2019 10:21:10 -0700
Subject: Fix mismatch between release and EEP in sunlight and ambient color
 from settings.

---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 3d05912f49..fc49562235 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -62,8 +62,8 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     vec4 sunlight = (sun_up_factor == 1) ? sunlight_color : moonlight_color;
     vec4 light_atten;
 
-    float dens_mul = density_multiplier * 0.5; // get back to original pre-EEP range...
-    float dist_mul = distance_multiplier * 0.1; // get back to original pre-EEP range...
+    float dens_mul = density_multiplier;
+    float dist_mul = distance_multiplier * 0.1;
 
     //sunlight attenuation effect (hue and brightness) due to atmosphere
     //this is used later for sunlight modulation at various altitudes
@@ -76,7 +76,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     haze_weight = vec4(haze_density) / temp1;
 
     //(TERRAIN) compute sunlight from lightnorm only (for short rays like terrain)
-    temp2.y = max(0.0, tmpLightnorm.y);
+    temp2.y = max(0.0, tmpLightnorm.z);
     if (temp2.y > 0.001f)
     {
         temp2.y = 1. / temp2.y;
-- 
cgit v1.2.3


From 6ee2fadaa8fd782eccff29777dc93aa508c5bf74 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 23 Apr 2019 10:37:24 -0700
Subject: SL-1491

Modify handling of additive to make extreme range of glow focus/size safe from lens flare artifacts.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index fc49562235..07190d081e 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -102,9 +102,9 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
         //temp2.x is 0 at the sun and increases away from sun
     temp2.x = max(temp2.x, .001);    //was glow.y
         //set a minimum "angle" (smaller glow.y allows tighter, brighter hotspot)
-    temp2.x *= glow.x;
+    temp2.x *= glow.x * 1.8;
         //higher glow.x gives dimmer glow (because next step is 1 / "angle")
-    temp2.x = pow(temp2.x, glow.z);
+    temp2.x = pow(temp2.x, glow.z * 0.2);
         //glow.z should be negative, so we're doing a sort of (1 / "angle") function
 
     //add "minimum anti-solar illumination"
-- 
cgit v1.2.3


From a685e024a62751289ccfa41c962b039d1de748bd Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 23 Apr 2019 13:12:16 -0700
Subject: SL-10901

Bias shadow sampling and allow control of how dark shadows are (clamped ambient).
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl     | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 07190d081e..09fb3e4c8a 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -42,6 +42,11 @@ uniform mat3 ssao_effect_mat;
 uniform int no_atmo;
 uniform float sun_moon_glow_factor;
 
+float getAmbientClamp()
+{
+    return 0.88f;
+}
+
 void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
 
     vec3 P = inPositionEye;
-- 
cgit v1.2.3


From 5766325290974ee2cfa30fd655060ef396d1e87a Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 25 Apr 2019 13:02:24 -0700
Subject: SL-10904, SL-10998, SL-11018

Fix handling of 1/light_y when y was tiny but getting even tinier.

Add similar adjustment to shader version of same calc.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 09fb3e4c8a..93513acabe 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -81,12 +81,12 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     haze_weight = vec4(haze_density) / temp1;
 
     //(TERRAIN) compute sunlight from lightnorm only (for short rays like terrain)
-    temp2.y = max(0.0, tmpLightnorm.z);
-    if (temp2.y > 0.001f)
+    temp2.y = max(0.0, tmpLightnorm.y);
+    if (abs(temp2.y) > 0.000001f)
     {
-        temp2.y = 1. / temp2.y;
+        temp2.y = 1. / abs(temp2.y);
     }
-    temp2.y = max(0.001f, temp2.y);
+    temp2.y = max(0.0000001f, temp2.y);
     sunlight *= exp(-light_atten * temp2.y);
 
     // main atmospheric scattering line integral
-- 
cgit v1.2.3


From 250c8474914290aea0bb8edb8c3754ddd4a26f3e Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 26 Apr 2019 09:34:33 -0700
Subject: SL-11041

Put ambient clamp threshold back for lighter shadows but closer match to release lighting.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 93513acabe..cd1e2d6e32 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -44,7 +44,7 @@ uniform float sun_moon_glow_factor;
 
 float getAmbientClamp()
 {
-    return 0.88f;
+    return 0.66f;
 }
 
 void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
-- 
cgit v1.2.3


From f133be068a4aa23c02c47348f5c7d4a28e1d5c37 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 26 Apr 2019 16:02:21 -0700
Subject: Lighting WIP

Consistency across class2/3/ALM lighting.
---
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl | 6 +++---
 .../app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
index 06f13b11f2..206a51db27 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl
@@ -27,10 +27,10 @@ uniform vec4 sunlight_color;
 uniform vec4 light_ambient;
 uniform int no_atmo;
 
-vec3 atmosAmbient(vec3 light)
+vec3 atmosAmbient()
 {
-    if (no_atmo == 1) return light + vec3(0.66);
-    return light + light_ambient.rgb;
+    if (no_atmo == 1) return vec3(0.16);
+    return light_ambient.rgb;
 }
 
 vec3 atmosAffectDirectionalLight(float lightIntensity)
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
index c24df9eaeb..c266f9732f 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl
@@ -27,10 +27,10 @@ uniform vec4 sunlight_color;
 uniform vec4 light_ambient;
 uniform int no_atmo;
 
-vec3 atmosAmbient(vec3 light)
+vec3 atmosAmbient()
 {
-    if (no_atmo == 1) return light + vec3(0.66);
-    return light + light_ambient.rgb;
+    if (no_atmo == 1) return vec3(0.66);
+    return light_ambient.rgb;
 }
 
 vec3 atmosAffectDirectionalLight(float lightIntensity)
-- 
cgit v1.2.3


From c4032528aff8ef1938e897ec583bbf25a3e713e1 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 2 May 2019 13:49:35 -0700
Subject: Roll back sRGB decode changes from contrib for now.

Fix direct light matching across alpha/blended-material/deferred.

Get diffuse lighting to match from Low to Ultra.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index cd1e2d6e32..a3041fccdc 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -137,7 +137,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
           + tmpAmbient));
 
     //brightness of surface both sunlight and ambient
-    sunlit = sunlight.rgb;
+    sunlit = sunlight.rgb * 0.5;
     amblit = tmpAmbient.rgb * .25;
     additive *= vec3(1.0 - temp1);
 }
-- 
cgit v1.2.3


From a1e8042c1f2f1ab0ed5b6040535348974e659556 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 7 May 2019 15:36:43 -0700
Subject: SL-11055, SL-10966, SL-11087

Make haze look more like WL.

Make lack of sun and moon mean black and fixed dir to prevent spooky underlighting.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index a3041fccdc..6788cc1f63 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -68,7 +68,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     vec4 light_atten;
 
     float dens_mul = density_multiplier;
-    float dist_mul = distance_multiplier * 0.1;
+    float dist_mul = distance_multiplier;
 
     //sunlight attenuation effect (hue and brightness) due to atmosphere
     //this is used later for sunlight modulation at various altitudes
-- 
cgit v1.2.3


From b143aa96fcd6d16558464c98bcfd9984f7d29750 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 13 May 2019 15:33:48 -0700
Subject: SL-10856

Modify calc of sunlight to avoid clipping in gamma correct on values outside 0-1 range.

Modify shaders to put back ambient clamp tuned to be close to ambient contrib in low/mid lighting.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 6788cc1f63..7f5ac00963 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -44,7 +44,7 @@ uniform float sun_moon_glow_factor;
 
 float getAmbientClamp()
 {
-    return 0.66f;
+    return 0.2f;
 }
 
 void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
@@ -137,7 +137,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
           + tmpAmbient));
 
     //brightness of surface both sunlight and ambient
-    sunlit = sunlight.rgb * 0.5;
-    amblit = tmpAmbient.rgb * .25;
+    sunlit = sunlight.rgb;
+    amblit = tmpAmbient.rgb;
     additive *= vec3(1.0 - temp1);
 }
-- 
cgit v1.2.3


From 8d30b644f2a9620e361ead27367e49ce700d318e Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 16 May 2019 08:33:09 -0700
Subject: SL-11195

Adjust ambient clamp up to get closer match to release viewer for existing content.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 7f5ac00963..6c22ef5636 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -44,7 +44,7 @@ uniform float sun_moon_glow_factor;
 
 float getAmbientClamp()
 {
-    return 0.2f;
+    return 0.45f;
 }
 
 void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
-- 
cgit v1.2.3


From b3c0218a31b9d7dd699cf3944bbcfc35e9adbd49 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 16 May 2019 14:14:02 -0700
Subject: Revert lighting changes for 10856 causing knock-on.

---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 6c22ef5636..68eb671e7c 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -137,7 +137,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
           + tmpAmbient));
 
     //brightness of surface both sunlight and ambient
-    sunlit = sunlight.rgb;
-    amblit = tmpAmbient.rgb;
+    sunlit = sunlight.rgb * 0.5;
+    amblit = tmpAmbient.rgb * .25;
     additive *= vec3(1.0 - temp1);
 }
-- 
cgit v1.2.3


From e9dbee00262a437e4b3f971b37ea636e92032133 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 21 May 2019 16:00:45 -0700
Subject: SL-11238

Fix ambient light inputs to the renderer.

Fix 3rd sky shader w/ mistaken density mod conversion.

Make ambient clamp apply to all modes.

Tune ALM ambient clamp to match non-ALM.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 68eb671e7c..55ffbdcc46 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -44,7 +44,7 @@ uniform float sun_moon_glow_factor;
 
 float getAmbientClamp()
 {
-    return 0.45f;
+    return 0.9;
 }
 
 void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
-- 
cgit v1.2.3


From 2f2cf6d855e1e5977ef0ed3583238636e890220a Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 29 May 2019 15:57:24 -0700
Subject: SL-10969

Modify ambient handling and forward projector lighting again to stamp out alpha fires.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 55ffbdcc46..a702b8d510 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -138,6 +138,6 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
 
     //brightness of surface both sunlight and ambient
     sunlit = sunlight.rgb * 0.5;
-    amblit = tmpAmbient.rgb * .25;
+    amblit = tmpAmbient.rgb * .5;
     additive *= vec3(1.0 - temp1);
 }
-- 
cgit v1.2.3


From 16d3279995bcb4a4766b721d0897b3d2199971d5 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 3 Jun 2019 11:30:41 -0700
Subject: SL-10966

Fix light atten and transmittance calcs breaking ambient color contrib to fog.

Needs to be tested on DRTSIM-415 or better to get legacy viewer settings that match EEP.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl      | 4 ++--
 indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index a702b8d510..9116b86f39 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -27,7 +27,7 @@ uniform vec4 lightnorm;
 uniform vec4 sunlight_color;
 uniform vec4 moonlight_color;
 uniform int sun_up_factor;
-uniform vec4 ambient;
+uniform vec4 ambient_color;
 uniform vec4 blue_horizon;
 uniform vec4 blue_density;
 uniform float haze_horizon;
@@ -118,7 +118,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     temp2.x *= sun_moon_glow_factor;
     
     //increase ambient when there are more clouds
-    vec4 tmpAmbient = ambient + (vec4(1.) - ambient) * cloud_shadow * 0.5;
+    vec4 tmpAmbient = ambient_color + (vec4(1.) - ambient_color) * cloud_shadow * 0.5;
     
     /*  decrease value and saturation (that in HSV, not HSL) for occluded areas
      * // for HSV color/geometry used here, see http://gimp-savvy.com/BOOK/index.html?node52.html
diff --git a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
index 537d6ebb99..1d004b2b3e 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
@@ -49,7 +49,6 @@ uniform vec4 cloud_color;
 uniform float cloud_shadow;
 uniform float cloud_scale;
 uniform float cloud_variance;
-uniform vec3 ambient;
 uniform vec3 camPosLocal;
 uniform vec3 sun_dir;
 uniform float sun_size;
-- 
cgit v1.2.3


From 48401b224d778b21e4d8ae08365718591907d14b Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 5 Jun 2019 08:58:28 -0700
Subject: SL-9989

Clamp fog distance multiplier to >= 0.05 and adjust min range on control as well.

Make sky shaders use dist mul consistently.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 9116b86f39..291e160cdc 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -68,7 +68,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     vec4 light_atten;
 
     float dens_mul = density_multiplier;
-    float dist_mul = distance_multiplier;
+    float dist_mul = max(0.05, distance_multiplier);
 
     //sunlight attenuation effect (hue and brightness) due to atmosphere
     //this is used later for sunlight modulation at various altitudes
-- 
cgit v1.2.3


From 49eae58bd0d1eceda18a3997454beb15a5e27cbd Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 6 Jun 2019 16:32:55 -0700
Subject: SL-10969

More tweaking ambient light.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 291e160cdc..fa20d63a4a 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -44,7 +44,7 @@ uniform float sun_moon_glow_factor;
 
 float getAmbientClamp()
 {
-    return 0.9;
+    return 1.0f;
 }
 
 void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
@@ -138,6 +138,6 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
 
     //brightness of surface both sunlight and ambient
     sunlit = sunlight.rgb * 0.5;
-    amblit = tmpAmbient.rgb * .5;
+    amblit = tmpAmbient.rgb * .25;
     additive *= vec3(1.0 - temp1);
 }
-- 
cgit v1.2.3


From b79d0d2fdd047636598cbc9b088c3d4a10a84460 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 10 Jun 2019 09:15:35 -0700
Subject: SL-10969, SL-11051

Make fullbright alpha mask with mask cutoff == 0 not generate shadows.

Adjust handling of ambient across forward and deferred again.
---
 .../shaders/class1/windlight/atmosphericsFuncs.glsl         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index fa20d63a4a..deda4d8b7e 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -47,7 +47,7 @@ float getAmbientClamp()
     return 1.0f;
 }
 
-void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten) {
+void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten, bool use_ao) {
 
     vec3 P = inPositionEye;
    
@@ -116,9 +116,11 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     temp2.x += .25;
 
     temp2.x *= sun_moon_glow_factor;
-    
+   
+    vec4 amb_color = ambient_color; 
+
     //increase ambient when there are more clouds
-    vec4 tmpAmbient = ambient_color + (vec4(1.) - ambient_color) * cloud_shadow * 0.5;
+    vec4 tmpAmbient = amb_color + (vec4(1.) - amb_color) * cloud_shadow * 0.5;
     
     /*  decrease value and saturation (that in HSV, not HSL) for occluded areas
      * // for HSV color/geometry used here, see http://gimp-savvy.com/BOOK/index.html?node52.html
@@ -128,7 +130,10 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
      * vec3 ambHueSat = vec3(tmpAmbient) - vec3(ambValue);
      * tmpAmbient = vec4(RenderSSAOEffect.valueFactor * vec3(ambValue) + RenderSSAOEffect.saturationFactor *(1.0 - ambFactor) * ambHueSat, ambAlpha);
      */
-    tmpAmbient = vec4(mix(ssao_effect_mat * tmpAmbient.rgb, tmpAmbient.rgb, ambFactor), tmpAmbient.a);
+    if (use_ao)
+    {
+        tmpAmbient = vec4(mix(ssao_effect_mat * tmpAmbient.rgb, tmpAmbient.rgb, ambFactor), tmpAmbient.a);
+    }
 
     //haze color
         additive =
-- 
cgit v1.2.3


From 48f169423ba0c1da8ffe13fc8bc4cec76336d8fc Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 3 Jul 2019 10:04:05 -0700
Subject: SL-11545, SL-11543, SL-10625

Fix emissives without normal maps clobbering the alpha output in materialF.

Modify glow size calc to get close to pre-EEP sun glow behavior (may require sky vert settings >= mid).

Make bake ignore alpha readback for Intel until we can determine why their drivers now go boom.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index deda4d8b7e..786a65df0f 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -68,7 +68,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     vec4 light_atten;
 
     float dens_mul = density_multiplier;
-    float dist_mul = max(0.05, distance_multiplier);
+    float dist_mul = distance_multiplier;
 
     //sunlight attenuation effect (hue and brightness) due to atmosphere
     //this is used later for sunlight modulation at various altitudes
@@ -107,9 +107,9 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
         //temp2.x is 0 at the sun and increases away from sun
     temp2.x = max(temp2.x, .001);    //was glow.y
         //set a minimum "angle" (smaller glow.y allows tighter, brighter hotspot)
-    temp2.x *= glow.x * 1.8;
+    temp2.x *= glow.x;
         //higher glow.x gives dimmer glow (because next step is 1 / "angle")
-    temp2.x = pow(temp2.x, glow.z * 0.2);
+    temp2.x = pow(temp2.x, glow.z);
         //glow.z should be negative, so we're doing a sort of (1 / "angle") function
 
     //add "minimum anti-solar illumination"
-- 
cgit v1.2.3


From 664722168d7016d8bf80a65626bbff542913dc24 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 10 Jul 2019 14:50:59 -0700
Subject: SL-1491

Make sun additive contribition depend on facing the sun (without breaking fog).

Put back scaling factor keeping sun contrib from blowing out with new FS param range for glow.
---
 .../shaders/class1/windlight/atmosphericsFuncs.glsl            | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 786a65df0f..3fe3b7afd3 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -47,7 +47,7 @@ float getAmbientClamp()
     return 1.0f;
 }
 
-void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten, bool use_ao) {
+void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten, bool use_ao) {
 
     vec3 P = inPositionEye;
    
@@ -103,13 +103,19 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o
     //compute haze glow
     //(can use temp2.x as temp because we haven't used it yet)
     temp2.x = dot(Pn, tmpLightnorm.xyz);
+
+    // dampen sun additive contrib when not facing it...
+    if (length(light_dir) > 0.01)
+    {
+        temp2.x *= max(0.0f, dot(light_dir, Pn));
+    }
     temp2.x = 1. - temp2.x;
         //temp2.x is 0 at the sun and increases away from sun
     temp2.x = max(temp2.x, .001);    //was glow.y
         //set a minimum "angle" (smaller glow.y allows tighter, brighter hotspot)
     temp2.x *= glow.x;
         //higher glow.x gives dimmer glow (because next step is 1 / "angle")
-    temp2.x = pow(temp2.x, glow.z);
+    temp2.x = pow(temp2.x, glow.z * 0.2);
         //glow.z should be negative, so we're doing a sort of (1 / "angle") function
 
     //add "minimum anti-solar illumination"
-- 
cgit v1.2.3


From 2fa2da33022e0d64d02e0690f0345c5cc9dfca04 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 15 Jul 2019 15:59:45 -0700
Subject: SL-11590

Modified windlight shader to remove adjustment to glow.z
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 3fe3b7afd3..0607ea8bc5 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -115,7 +115,7 @@ void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, ou
         //set a minimum "angle" (smaller glow.y allows tighter, brighter hotspot)
     temp2.x *= glow.x;
         //higher glow.x gives dimmer glow (because next step is 1 / "angle")
-    temp2.x = pow(temp2.x, glow.z * 0.2);
+    temp2.x = pow(temp2.x, glow.z);
         //glow.z should be negative, so we're doing a sort of (1 / "angle") function
 
     //add "minimum anti-solar illumination"
-- 
cgit v1.2.3


From aa4b24beee1d6451370983517d7ac3755429e26f Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 22 Jul 2019 12:21:24 -0700
Subject: SL-11443

Make fullbright rigged objects with alpha mode none use fullbright shader instead of incorrectly using the material shader.

Increase effect of variance in cloud shaders.
---
 indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
index 1d004b2b3e..82fad4db5a 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/cloudShadowF.glsl
@@ -82,12 +82,12 @@ void main()
         vec2 disturbance2 = vec2(cloudNoise((uv1 + uv3) / 4.0f).x, cloudNoise((uv4 + uv2) / 8.0f).x) * cloud_variance * (1.0f - cloud_scale * 0.25f);
     
         // Offset texture coords
-        uv1 += cloud_pos_density1.xy + (disturbance * 0.02);    //large texture, visible density
+        uv1 += cloud_pos_density1.xy + (disturbance * 0.2);    //large texture, visible density
         uv2 += cloud_pos_density1.xy;   //large texture, self shadow
         uv3 += cloud_pos_density2.xy;   //small texture, visible density
         uv4 += cloud_pos_density2.xy;   //small texture, self shadow
     
-        float density_variance = min(1.0, (disturbance.x* 2.0 + disturbance.y* 2.0 + disturbance2.x + disturbance2.y));
+        float density_variance = min(1.0, (disturbance.x* 2.0 + disturbance.y* 2.0 + disturbance2.x + disturbance2.y) * 4.0);
     
         cloudDensity *= 1.0 - (density_variance * density_variance);
     
-- 
cgit v1.2.3


From b507d63566e8896af702dd10f5643dc29068a8a9 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 23 Jul 2019 11:36:22 -0700
Subject: SL-11621

Remove all references to unused shader var global_gamma.

Remove many unused decls for gamma from shaders.

Make post-deferred gamma correction use display_gamma.

Make setting display_gamma use the correct RenderDeferredDisplayGamma setting.
---
 .../newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl | 1 -
 indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl          | 1 -
 2 files changed, 2 deletions(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 0607ea8bc5..4460ef905b 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -22,7 +22,6 @@
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
-uniform vec4 gamma;
 uniform vec4 lightnorm;
 uniform vec4 sunlight_color;
 uniform vec4 moonlight_color;
diff --git a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
index 346634af33..fc51e81177 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl
@@ -24,7 +24,6 @@
  */
  
 uniform int no_atmo;
-uniform vec4 gamma;
 
 vec3 scaleSoftClipFrag(vec3 light)
 {
-- 
cgit v1.2.3


From 872d82529f7ca2afc3cbd3d1436c5026105da489 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 9 Sep 2019 09:08:58 -0700
Subject: SL-1144

The un-water-fogged gap area was rendering while we were still above water, but the water surface was being near culled.

I've re-enabled preculling water objects (which also fixes issues with water culling vs spinning the camera) and it seems to behave correctly.
---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 4460ef905b..e5f1e11180 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -121,7 +121,7 @@ void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, ou
     temp2.x += .25;
 
     temp2.x *= sun_moon_glow_factor;
-   
+ 
     vec4 amb_color = ambient_color; 
 
     //increase ambient when there are more clouds
-- 
cgit v1.2.3


From 7c7d71269f5b47397d14bbe44e341e4ac1d96889 Mon Sep 17 00:00:00 2001
From: Runitai Linden <davep@lindenlab.com>
Date: Thu, 5 Mar 2020 16:28:06 -0600
Subject: WIP - Windlight sun lighting should happen in sRGB space, not linear
 space.  This keeps ambient from getting overblown and better matches
 environment lighting with ALM on/off.

---
 .../app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index e5f1e11180..dcb02bd1c1 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -46,6 +46,7 @@ float getAmbientClamp()
     return 1.0f;
 }
 
+
 void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten, bool use_ao) {
 
     vec3 P = inPositionEye;
@@ -123,7 +124,7 @@ void calcAtmosphericVars(vec3 inPositionEye, vec3 light_dir, float ambFactor, ou
     temp2.x *= sun_moon_glow_factor;
  
     vec4 amb_color = ambient_color; 
-
+    
     //increase ambient when there are more clouds
     vec4 tmpAmbient = amb_color + (vec4(1.) - amb_color) * cloud_shadow * 0.5;
     
-- 
cgit v1.2.3


From 8c1b9d3e7a194c106ee79067e3136c37ea7e84e1 Mon Sep 17 00:00:00 2001
From: Runitai Linden <davep@lindenlab.com>
Date: Mon, 16 Mar 2020 12:10:34 -0500
Subject: Add missing fullbrightAtmosTransportFrag stub.

---
 indra/newview/app_settings/shaders/class1/windlight/transportF.glsl | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/app_settings/shaders/class1/windlight')

diff --git a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
index 79d8d11b32..a937d9fa99 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/transportF.glsl
@@ -37,6 +37,12 @@ vec3 atmosTransport(vec3 light)
     return light;
 }
 
+vec3 fullbrightAtmosTransportFrag(vec3 light, vec3 additive, vec3 atten)
+{
+    /* stub function for fallback compatibility on class1 hardware */
+    return light;
+}
+
 vec3 fullbrightAtmosTransport(vec3 light)
 {
     /* stub function for fallback compatibility on class1 hardware */
-- 
cgit v1.2.3