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/customalphaV.glsl | |
parent | 8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff) | |
parent | 1bea08335b6c2fa31f414db2fe7316a118b2ec18 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/customalphaV.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/customalphaV.glsl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/customalphaV.glsl b/indra/newview/app_settings/shaders/class1/interface/customalphaV.glsl index c4c896c35c..890474d6d8 100644 --- a/indra/newview/app_settings/shaders/class1/interface/customalphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/customalphaV.glsl @@ -22,13 +22,20 @@ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ - +uniform mat4 modelview_projection_matrix; + +ATTRIBUTE vec3 position; +ATTRIBUTE vec4 diffuse_color; +ATTRIBUTE vec2 texcoord0; + +VARYING vec4 vertex_color; +VARYING vec2 vary_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.xyz, 1.0); + vary_texcoord0 = texcoord0; + vertex_color = diffuse_color; } |