1 files changed, 35 insertions, 64 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
index caf20ce707..b331258952 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
@@ -35,7 +35,7 @@ uniform sampler2DRect diffuseRect;
 uniform sampler2DRect specularRect;
 uniform sampler2DRect normalMap;
 uniform samplerCube environmentMap;
-uniform sampler2D noiseMap;
+//uniform sampler2D noiseMap;
 uniform sampler2D lightFunc;
 uniform sampler2DRect depthMap;
 
@@ -54,22 +54,6 @@ uniform vec2 screen_res;
 uniform mat4 inv_proj;
 uniform vec4 viewport;
 
-#ifdef SINGLE_FP_ONLY
-vec2 encode_normal(vec3 n)
-{
-	vec2 sn;
-	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
-	return sn;
-}
-
-vec3 decode_normal (vec2 enc)
-{
-	vec3 n;
-	n.xy = (enc.xy * vec2(2.0f,2.0f)) - vec2(1.0f,1.0f);
-	n.z = sqrt(1.0f - dot(n.xy,n.xy));
-	return n;
-}
-#else
 vec2 encode_normal(vec3 n)
 {
 	float f = sqrt(8 * n.z + 8);
@@ -86,7 +70,6 @@ vec3 decode_normal (vec2 enc)
     n.z = 1-f/2;
     return n;
 }
-#endif
 
 vec4 getPosition(vec2 pos_screen)
 {
@@ -110,64 +93,52 @@ void main()
 	
 	vec3 pos = getPosition(frag.xy).xyz;
 	vec3 lv = trans_center.xyz-pos;
-	float dist = length(lv);
-	dist /= size;
-	if (dist > 1.0)
-	{
-		discard;
-	}
+	float d = length(lv);
 	
-	vec3 norm = texture2DRect(normalMap, frag.xy).xyz;
-	norm = decode_normal(norm.xy); // unpack norm
-	float da = dot(norm, lv);
-	if (da < 0.0)
+	float dist = d*size;
+
+	vec3 col = vec3(0.0);
+	if (dist <= 1.0)
 	{
-		discard;
-	}
-	
-	norm = normalize(norm);
-	lv = normalize(lv);
-	da = dot(norm, lv);
+		vec3 norm = texture2DRect(normalMap, frag.xy).xyz;
+		norm = decode_normal(norm.xy); // unpack norm
+			
+		norm = normalize(norm);
+		lv = normalize(lv);
+		float da = max(dot(norm, lv), 0.0);
 	
-	float noise = texture2D(noiseMap, frag.xy/128.0).b;
+		//float noise = texture2D(noiseMap, frag.xy/128.0).b;
 	
-	vec3 col = texture2DRect(diffuseRect, frag.xy).rgb;
-	float fa = falloff+1.0;
-	float dist_atten = clamp(1.0-(dist-1.0*(1.0-fa))/fa, 0.0, 1.0);
-	dist_atten *= dist_atten;
-	dist_atten *= 2.0;
+		col = texture2DRect(diffuseRect, frag.xy).rgb;
+		float fa = falloff+1.0;
+		float dist_atten = clamp(1.0-(dist-1.0+fa)/fa, 0.0, 1.0);
+		dist_atten *= dist_atten;
+		dist_atten *= 2.0;
 	
-	float lit = da * dist_atten * noise;
+		float lit = da * dist_atten;
 
-	col = color.rgb*lit*col;
+		col = color.rgb*lit*col;
 
-	vec4 spec = texture2DRect(specularRect, frag.xy);
-	if (spec.a > 0.0)
-	{
-		lit = min(da*6.0, 1.0) * dist_atten;
-
-		vec3 npos = -normalize(pos);
-		vec3 h = normalize(lv+npos);
-		float nh = dot(norm, h);
-		float nv = dot(norm, npos);
-		float vh = dot(npos, h);
-		float sa = nh;
-		float fres = pow(1 - dot(h, npos), 5) * 0.4+0.5;
-		float gtdenom = 2 * nh;
-		float gt = max(0,(min(gtdenom * nv / vh, gtdenom * da / vh)));
-
-		if (nh > 0.0)
+		vec4 spec = texture2DRect(specularRect, frag.xy);
+		if (spec.a > 0.0)
 		{
+			lit = min(da*6.0, 1.0) * dist_atten;
+
+			vec3 npos = -normalize(pos);
+			vec3 h = normalize(lv+npos);
+			float nh = dot(norm, h);
+			float nv = dot(norm, npos);
+			float vh = dot(npos, h);
+			float sa = nh;
+			float fres = pow(1 - dot(h, npos), 5) * 0.4+0.5;
+			float gtdenom = 2 * nh;
+			float gt = max(0,(min(gtdenom * nv / vh, gtdenom * da / vh)));
+
 			float scol = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
-			col += lit*scol*color.rgb*spec.rgb;
+			col += max(lit*scol*color.rgb*spec.rgb, vec3(0.0));
 		}
 	}
 	
-	if (dot(col, col) <= 0.0)
-	{
-		discard;
-	}
-		
 	frag_color.rgb = col;	
 	frag_color.a = 0.0;
 }