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/interface/highlightF.glsl | |
| parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
| parent | 8dbfa022778f2a7fcd5d2b527045724551279412 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/highlightF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/highlightF.glsl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl index a3cb5225ba..ecbc30f05f 100644 --- a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl @@ -23,11 +23,16 @@ * $/LicenseInfo$ */ +#ifdef DEFINE_GL_FRAGCOLOR +out vec4 gl_FragColor; +#endif - +uniform vec4 color; uniform sampler2D diffuseMap; +VARYING vec2 vary_texcoord0; + void main() { - gl_FragColor = gl_Color*texture2D(diffuseMap, gl_TexCoord[0].xy); + gl_FragColor = color*texture2D(diffuseMap, vary_texcoord0.xy); } |