From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 7 Jan 2005 16:43:39 +0000 (+0000)
Subject: And fix the obvious bugs in higher-numbered templates.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f0e4f5e5567a91e362cdefce4bca0103ae9d56b4;p=mesa.git

And fix the obvious bugs in higher-numbered templates.
---

diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c
index fc9231cfe0f..279e5c1bedb 100644
--- a/src/mesa/tnl/t_vertex.c
+++ b/src/mesa/tnl/t_vertex.c
@@ -878,18 +878,18 @@ static void NAME( GLcontext *ctx,					\
       }									\
       									\
       if (NR > 2) {							\
-	 F1( &a[1], v + a[1].vertoffset, (GLfloat *)a[1].inputptr );	\
-	 a[1].inputptr += a[1].inputstride;				\
+	 F2( &a[2], v + a[2].vertoffset, (GLfloat *)a[2].inputptr );	\
+	 a[2].inputptr += a[2].inputstride;				\
       }									\
       									\
       if (NR > 3) {							\
-	 F1( &a[1], v + a[1].vertoffset, (GLfloat *)a[1].inputptr );	\
-	 a[1].inputptr += a[1].inputstride;				\
+	 F3( &a[3], v + a[3].vertoffset, (GLfloat *)a[3].inputptr );	\
+	 a[3].inputptr += a[3].inputstride;				\
       }									\
 									\
       if (NR > 4) {							\
-	 F1( &a[1], v + a[1].vertoffset, (GLfloat *)a[1].inputptr );	\
-	 a[1].inputptr += a[1].inputstride;				\
+	 F4( &a[4], v + a[4].vertoffset, (GLfloat *)a[4].inputptr );	\
+	 a[4].inputptr += a[4].inputstride;				\
       }									\
    }									\
 }
@@ -898,10 +898,10 @@ static void NAME( GLcontext *ctx,					\
 #define EMIT2(F0, F1, NAME) EMIT5(2, F0, F1, insert_null, \
 				  insert_null, insert_null, NAME)
 
-#define EMIT3(F0, F1, F2, NAME) EMIT5(2, F0, F1, F2, insert_null, \
+#define EMIT3(F0, F1, F2, NAME) EMIT5(3, F0, F1, F2, insert_null, \
 				      insert_null, NAME)
    
-#define EMIT4(F0, F1, F2, F3, NAME) EMIT5(2, F0, F1, F2, F3, \
+#define EMIT4(F0, F1, F2, F3, NAME) EMIT5(4, F0, F1, F2, F3, \
 				          insert_null, NAME)