From bd1a9dacf6a45e6aa6954eeb490d55ebcc80ace8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 5 Jan 2002 20:51:12 +0000
Subject: Vertex program checkpoint commit: converted all vertex attributes
 (color, normal, texcoords, fogcoord, secondary color, etc) to GLfloat[4]
 datatype. Aliasing of glVertex, glNormal, glColor, glFogCoord, etc. to
 glVertexAttrib now complete.

---
 src/mesa/main/mtypes.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main/mtypes.h')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f597c1d02f..e97ba8c8ce 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.56 2001/12/18 04:06:45 brianp Exp $ */
+/* $Id: mtypes.h,v 1.57 2002/01/05 20:51:12 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -314,11 +314,12 @@ struct gl_colorbuffer_attrib {
 #define VERT_ATTRIB_TEX5     13
 #define VERT_ATTRIB_TEX6     14
 #define VERT_ATTRIB_TEX7     15
+#define VERT_ATTRIB_MAX      16
 
 struct gl_current_attrib {
    /* These values valid only when FLUSH_VERTICES has been called.
     */
-   GLfloat Attrib[8 + MAX_TEXTURE_UNITS][4];	/* Current vertex attributes */
+   GLfloat Attrib[VERT_ATTRIB_MAX][4];		/* Current vertex attributes */
 						/* indexed by VERT_ATTRIB_* */
    GLuint Index;				/* Current color index */
    GLboolean EdgeFlag;				/* Current edge flag */
@@ -1132,7 +1133,7 @@ struct gl_evaluators {
 
 #define VP_MAX_INSTRUCTIONS 128
 
-#define VP_NUM_INPUT_REGS 16
+#define VP_NUM_INPUT_REGS VERT_ATTRIB_MAX
 #define VP_NUM_OUTPUT_REGS 15
 #define VP_NUM_TEMP_REGS 12
 #define VP_NUM_PROG_REGS 96
-- 
cgit v1.2.3