diff options
author | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:55:11 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:55:11 -0500 |
commit | f72a24bf3a5bf7ecb826ef5e6d7f17dbb92d5db2 (patch) | |
tree | a4a070ba8b95645089dcd55a848baec41b625cbc /indra/newview/app_settings/shaders/class1/interface/uiV.glsl | |
parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
parent | 530981a2149a74e1dc003cea1bbc9dc392fcae60 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/uiV.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/uiV.glsl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/uiV.glsl b/indra/newview/app_settings/shaders/class1/interface/uiV.glsl index b1b90d0b5e..a9e42a432f 100644 --- a/indra/newview/app_settings/shaders/class1/interface/uiV.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/uiV.glsl @@ -22,13 +22,19 @@ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ - + +uniform mat4 texture_matrix0; +uniform mat4 modelview_projection_matrix; + +attribute vec3 position; +attribute vec4 diffuse_color; +attribute vec2 texcoord0; void main() { - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - gl_TexCoord[0] = gl_MultiTexCoord0; - gl_FrontColor = gl_Color; + gl_Position = modelview_projection_matrix * vec4(position, 1); + gl_TexCoord[0] = texture_matrix0 * vec4(texcoord0,0,1); + gl_FrontColor = diffuse_color; } |