diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-25 14:39:05 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-25 14:39:05 -0500 |
| commit | 30d1a2d053fe7d6e0c88928cf51aa73865ee21e8 (patch) | |
| tree | 1a878cdf561ed5e2f4ce0edca2986239b9724b18 /indra/newview/app_settings/shaders/class1/interface/twotextureaddV.glsl | |
| parent | b7a349f231977d5917b29faacca143a85d925576 (diff) | |
| parent | c54f6cfdc3f44ccb6fee3acd5fa40bd177c67639 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/twotextureaddV.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/twotextureaddV.glsl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/twotextureaddV.glsl b/indra/newview/app_settings/shaders/class1/interface/twotextureaddV.glsl index 94aa964be6..3c2f297f7f 100644 --- a/indra/newview/app_settings/shaders/class1/interface/twotextureaddV.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/twotextureaddV.glsl @@ -23,12 +23,19 @@ * $/LicenseInfo$ */ +uniform mat4 modelview_projection_matrix; +ATTRIBUTE vec3 position; +ATTRIBUTE vec2 texcoord0; +ATTRIBUTE vec2 texcoord1; + +VARYING vec2 vary_texcoord0; +VARYING vec2 vary_texcoord1; void main() { - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - gl_TexCoord[0] = gl_MultiTexCoord0; - gl_TexCoord[1] = gl_MultiTexCoord1; + gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); + vary_texcoord0 = texcoord0; + vary_texcoord1 = texcoord1; } |