summaryrefslogtreecommitdiff
path: root/progs/glsl/multitex.vert
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-02-02 16:50:45 -0700
committerBrian Paul <brianp@vmware.com>2009-02-02 16:51:45 -0700
commit8e8b25c26a1ecb1b317b6e68a9a13a766d59150b (patch)
treea55c0357bdeefe3692ea795457da5c75185b463f /progs/glsl/multitex.vert
parent4c5f3903280372a03044440a070661514369b595 (diff)
demos: update multitex.c GLSL demo to use vertex arrays or glVertex-mode
Press 'a' to toggle drawing mode.
Diffstat (limited to 'progs/glsl/multitex.vert')
-rw-r--r--progs/glsl/multitex.vert10
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;
}