diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2009-09-15 14:16:22 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2009-09-15 14:16:22 +0800 |
| commit | e2ba90a9cc762cf00a168f0a59d31e7dc52fc42e (patch) | |
| tree | fe3206d7602ad935296884742980f3c4d30bd867 /progs/glsl/multitex.vert | |
| parent | 11a4292d4eb515813b82b8d688a318adef66b3e6 (diff) | |
| parent | b4b8800315637d9218a81c76f09df7d601710d29 (diff) | |
Merge commit 'eee/mesa-es' into android
Diffstat (limited to 'progs/glsl/multitex.vert')
| -rw-r--r-- | progs/glsl/multitex.vert | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/progs/glsl/multitex.vert b/progs/glsl/multitex.vert index 5518ca1ddd..4fae3b73fb 100644 --- a/progs/glsl/multitex.vert +++ b/progs/glsl/multitex.vert @@ -2,9 +2,13 @@ // Brian Paul +attribute vec4 TexCoord0, TexCoord1; +attribute vec4 VertCoord; + void main() { - gl_TexCoord[0] = gl_MultiTexCoord0; - gl_TexCoord[1] = gl_MultiTexCoord1; - gl_Position = ftransform(); + gl_TexCoord[0] = TexCoord0; + gl_TexCoord[1] = TexCoord1; + // note: may use gl_Vertex or VertCoord here for testing: + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; } |