Merged in graham_linden/viewer-eep-fixes (pull request #197)

SL-10032

4 files changed, 21 insertions, 17 deletions

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