Sky fixes.

Make class1 sky use pre-projection pos to get proper distances for attenuation.

Make all sky shaders use the dist_mul again.

Revert to using old sky tessellation logic (may regress bugs addressed by new tess code).

2 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
index 7d4d9eb49f..65e4fdf17f 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
@@ -41,6 +41,7 @@ uniform vec4 gamma;
 
 /// Soft clips the light with a gamma correction
 vec3 scaleSoftClip(vec3 light);
+vec3 srgb_to_linear(vec3 c);
 
 void main()
 {
diff --git a/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl b/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
index 45e79f36ea..b30651351d 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
@@ -66,7 +66,7 @@ void main()
 	gl_Position = pos;
 	
 	// Get relative position
-	vec3 P = pos.xyz - camPosLocal.xyz + vec3(0,50,0);
+	vec3 P = position.xyz - camPosLocal.xyz + vec3(0,50,0);
 
 	// Set altitude
 	if (P.y > 0.)
@@ -81,7 +81,7 @@ void main()
 	// Can normalize then
 	vec3 Pn = normalize(P);
 
-	float  Plen = length(P);
+	float Plen = length(P);
 
 	// Initialize temp variables
 	vec4 temp1 = vec4(0.);
@@ -114,9 +114,7 @@ void main()
 	// Transparency (-> temp1)
     // ATI Bugfix -- can't store temp1*temp2.z in a variable because the ati
     // compiler gets confused.
-    //temp1 = exp(-temp1 * temp2.z * dist_mul);
-    temp1 = exp(-temp1 * dist_mul);
-
+    temp1 = exp(-temp1 * temp2.z * dist_mul);
 
 	// Compute haze glow
 	temp2.x = dot(Pn, lightnorm.xyz);
@@ -132,12 +130,13 @@ void main()
 	// Add "minimum anti-solar illumination"
 	temp2.x += .25;
 
-    temp2.x *= sun_moon_glow_factor;
+    //temp2.x *= sun_moon_glow_factor;
 
     vec4 color = (    blue_horizon * blue_weight * (sunlight + ambient_color)
                 + (haze_horizon * haze_weight) * (sunlight * temp2.x + ambient_color)
              );
 
+
     // Final atmosphere additive
     color *= (1. - temp1);