diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-26 19:27:10 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-26 19:27:10 -0500 |
| commit | bd02cdc75f1c752a127d1303527be3a96479af93 (patch) | |
| tree | d8503b7c296a4cd4f1aa2954c03ff250beda4254 /indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl | |
| parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
| parent | 8dbfa022778f2a7fcd5d2b527045724551279412 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl index f3ad6f92de..7d83b9a72c 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl @@ -22,15 +22,22 @@ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ - -varying vec3 vary_normal; + +#ifndef gl_FragData +out vec4 gl_FragData[3]; +#endif + +VARYING vec3 vary_normal; uniform float minimum_alpha; uniform float maximum_alpha; +VARYING vec4 vertex_color; +VARYING vec2 vary_texcoord0; + void main() { - vec4 col = diffuseLookup(gl_TexCoord[0].xy) * gl_Color; + vec4 col = diffuseLookup(vary_texcoord0.xy) * vertex_color; if (col.a < minimum_alpha || col.a > maximum_alpha) { |