diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-05 19:18:58 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-05 19:18:58 -0500 |
| commit | 1f4bc180502d1a4448e18715596a61ae9f406c4f (patch) | |
| tree | 009f70b9f3d27ce28571d0f056a169497bb74b9f /indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl | |
| parent | 194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff) | |
| parent | 2b51a7a60942b1efc99cee43489ef2f92fa7a188 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl index 933e50fed1..f3351c08bf 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl @@ -1,5 +1,5 @@ /** - * @file diffuseF.glsl + * @file diffuseAlphaMaskF.glsl * * $LicenseInfo:firstyear=2011&license=viewerlgpl$ * Second Life Viewer Source Code @@ -22,18 +22,23 @@ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ - + +#ifndef gl_FragData +out vec4 gl_FragData[3]; +#endif uniform float minimum_alpha; uniform float maximum_alpha; uniform sampler2D diffuseMap; -varying vec3 vary_normal; +VARYING vec3 vary_normal; +VARYING vec4 vertex_color; +VARYING vec2 vary_texcoord0; void main() { - vec4 col = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy) * gl_Color; + vec4 col = texture2D(diffuseMap, vary_texcoord0.xy) * vertex_color; if (col.a < minimum_alpha || col.a > maximum_alpha) { |