diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-02 11:46:18 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-02 11:46:18 -0500 |
| commit | 55f69de90c9b32c7fa25f16ec7d1f41064eff614 (patch) | |
| tree | 054b0d99490cc6600b3be0e3cb2aaf7918f3fe50 /indra/newview/app_settings/shaders/class1/interface/uiF.glsl | |
| parent | 8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff) | |
| parent | 1bea08335b6c2fa31f414db2fe7316a118b2ec18 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/uiF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/uiF.glsl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/uiF.glsl b/indra/newview/app_settings/shaders/class1/interface/uiF.glsl index 7694056b08..36d6e06fc5 100644 --- a/indra/newview/app_settings/shaders/class1/interface/uiF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/uiF.glsl @@ -22,10 +22,17 @@ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ - + +#ifdef DEFINE_GL_FRAGCOLOR +out vec4 gl_FragColor; +#endif + uniform sampler2D diffuseMap; +VARYING vec2 vary_texcoord0; +VARYING vec4 vertex_color; + void main() { - gl_FragColor = gl_Color*texture2D(diffuseMap, gl_TexCoord[0].xy); + gl_FragColor = vertex_color*texture2D(diffuseMap, vary_texcoord0.xy); } |