diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-07 14:08:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-07 14:08:36 -0400 |
| commit | 5d92dc44026f7dd237aa871593080fd151064e62 (patch) | |
| tree | 4f0c70e428824a0a01e38ff77850fb009b6c13f0 /indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl | |
| parent | 7614ceff24129643ecb96f57f0491507e4ff8dbd (diff) | |
| parent | 4d77146b9016a4db37112e153e71c05c596f7fdc (diff) | |
merge changes for 2.7.4 release
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl index 847b36b1ac..d53850b489 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl @@ -5,7 +5,7 @@ * $License$ */ -#version 120 + #extension GL_ARB_texture_rectangle : enable @@ -45,7 +45,7 @@ uniform float spot_shadow_offset; vec4 getPosition(vec2 pos_screen) { - float depth = texture2DRect(depthMap, pos_screen.xy).a; + float depth = texture2DRect(depthMap, pos_screen.xy).r; vec2 sc = pos_screen.xy*2.0; sc /= screen_res; sc -= vec2(1.0,1.0); @@ -234,7 +234,7 @@ void main() gl_FragColor[0] = shadow; gl_FragColor[1] = calcAmbientOcclusion(pos, norm); - spos.xyz = shadow_pos+offset*spot_shadow_offset; + spos.xyz = shadow_pos+norm*spot_shadow_offset; //spotlight shadow 1 vec4 lpos = shadow_matrix[4]*spos; |