From 8e8b25c26a1ecb1b317b6e68a9a13a766d59150b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 2 Feb 2009 16:50:45 -0700
Subject: demos: update multitex.c GLSL demo to use vertex arrays or
 glVertex-mode

Press 'a' to toggle drawing mode.
---
 progs/glsl/multitex.vert | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'progs/glsl/multitex.vert')

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;
 }
-- 
cgit v1.2.3