diff options
author | Dave Parks <davep@lindenlab.com> | 2011-06-07 13:59:40 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-06-07 13:59:40 -0500 |
commit | 690f18c948003c9d14524da8cdf5b82da8227758 (patch) | |
tree | ff35e520c853e3f0005eb6e3bd61e0c659e9194e /indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl | |
parent | 0de24f857ac359e04d7def2afa7d8efe5a4cef97 (diff) | |
parent | 70f959f01e845b3a7b6211f82c20d0cbd6641c39 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl index 3b12a07a27..4a0815a163 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl @@ -5,13 +5,14 @@ * $/LicenseInfo$ */ -#version 120 + #extension GL_ARB_texture_rectangle : enable -uniform sampler2D diffuseMap; uniform sampler2DRect depthMap; +vec4 diffuseLookup(vec2 texcoord); + uniform mat4 shadow_matrix[6]; uniform vec4 shadow_clip; uniform vec2 screen_res; @@ -47,7 +48,7 @@ void main() vec4 pos = vec4(vary_position, 1.0); - vec4 diff= texture2D(diffuseMap, gl_TexCoord[0].xy); + vec4 diff= diffuseLookup(gl_TexCoord[0].xy); vec4 col = vec4(vary_ambient + vary_directional.rgb, gl_Color.a); vec4 color = diff * col; |