From d03f4c2a312b1a4d8f33cd171a958670f508da70 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 11 May 2010 00:57:30 -0500
Subject: EXT-7225 Fix for busted projector shadows under certain settings.
 (transplanted from 63218c79aa5670331235d3fde25de4a595991460)

---
 indra/newview/app_settings/settings.xml                           | 2 +-
 indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index dee0138729..66a3fd9f43 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6603,7 +6603,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.01</real>
+    <real>-0.01</real>
   </map>
 
   <key>RenderShadowResolutionScale</key>
diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl
index 195a20e9dd..70e241b53a 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl
@@ -77,6 +77,7 @@ float pcfShadow(sampler2DRectShadow shadowMap, vec4 stc, float scl)
 
 float pcfShadow(sampler2DShadow shadowMap, vec4 stc, float scl)
 {
+	stc.z += spot_shadow_offset;
 	stc.xyz /= stc.w;
 	stc.z += spot_shadow_bias*scl;
 	
@@ -182,7 +183,7 @@ void main()
 	gl_FragColor[0] = shadow;
 	gl_FragColor[1] = 1.0;
 	
-	spos.xyz = shadow_pos+offset*spot_shadow_offset;
+	spos = vec4(shadow_pos, 1.0);
 	
 	//spotlight shadow 1
 	vec4 lpos = shadow_matrix[4]*spos;
-- 
cgit v1.2.3