fragment program execution

[mesa.git] / src / mesa / tnl / t_context.h

diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h
index bf8b220fcbd00283ccdd7f1b466bee254e80fb5b..1647fec12873fa3dd71d958a7603b970fc45a9f9 100644 (file)
--- a/src/mesa/tnl/t_context.h
+++ b/src/mesa/tnl/t_context.h
@@ -1,8 +1,8 @@
-/* $Id: t_context.h,v 1.42 2002/06/23 02:32:39 brianp Exp $ */
+/* $Id: t_context.h,v 1.44 2003/01/14 04:55:47 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  5.1
  *
  * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
  *
@@ -93,40 +93,6 @@
 #define VERT_BIT_CLIP        VERT_BIT_END   /* vb only, reuse imm bit*/
 
 
-/*
- * XXXX these are temporary - for backward compatibility w/ DRI drivers
- */
-#define VERT_OBJ             VERT_BIT_POS
-#define VERT_RGBA            VERT_BIT_COLOR0
-#define VERT_NORM            VERT_BIT_NORMAL
-#define VERT_INDEX           VERT_BIT_INDEX
-#define VERT_EDGE            VERT_BIT_SEVEN
-#define VERT_SPEC_RGB        VERT_BIT_COLOR1
-#define VERT_FOG_COORD       VERT_BIT_FOG
-#define VERT_TEX0            VERT_BIT_TEX0
-#define VERT_TEX1            VERT_BIT_TEX1
-#define VERT_TEX2            VERT_BIT_TEX2
-#define VERT_TEX3            VERT_BIT_TEX3
-#define VERT_TEX4            VERT_BIT_TEX4
-#define VERT_TEX5            VERT_BIT_TEX5
-#define VERT_TEX6            VERT_BIT_TEX6
-#define VERT_TEX7            VERT_BIT_TEX7
-#define VERT_EVAL_C1         VERT_BIT_EVAL_C1
-#define VERT_EVAL_C2         VERT_BIT_EVAL_C2
-#define VERT_EVAL_P1         VERT_BIT_EVAL_P1
-#define VERT_EVAL_P2         VERT_BIT_EVAL_P2
-#define VERT_OBJ_3           VERT_BIT_OBJ_3
-#define VERT_OBJ_4           VERT_BIT_OBJ_4
-#define VERT_MATERIAL        VERT_BIT_MATERIAL
-#define VERT_ELT             VERT_BIT_ELT
-#define VERT_BEGIN           VERT_BIT_BEGIN
-#define VERT_END             VERT_BIT_END
-#define VERT_END_VB          VERT_BIT_END_VB
-#define VERT_POINT_SIZE      VERT_BIT_POINT_SIZE
-#define VERT_EYE             VERT_BIT_EYE
-#define VERT_CLIP            VERT_BIT_CLIP
-
-
 /* Flags for IM->TexCoordSize.  Enough flags for 16 units.
  */
 #define TEX_0_SIZE_3          (unsigned)0x1
@@ -250,7 +216,7 @@ struct vertex_arrays
    struct gl_client_array SecondaryColor;
    GLvector1ui Index;
    GLvector1ub EdgeFlag;
-   GLvector4f  TexCoord[MAX_TEXTURE_UNITS];
+   GLvector4f  TexCoord[MAX_TEXTURE_COORD_UNITS];
    GLvector1ui Elt;
    GLvector4f  FogCoord;
    GLvector4f  Attribs[VERT_ATTRIB_MAX];
@@ -284,7 +250,7 @@ typedef struct vertex_buffer
    GLvector4f  *NormalPtr;                     /* VERT_BIT_NORMAL */
    GLfloat     *NormalLengthPtr;               /* VERT_BIT_NORMAL */
    GLboolean   *EdgeFlag;                      /* VERT_BIT_EDGEFLAG */
-   GLvector4f  *TexCoordPtr[MAX_TEXTURE_UNITS];        /* VERT_TEX_0..n */
+   GLvector4f  *TexCoordPtr[MAX_TEXTURE_COORD_UNITS]; /* VERT_TEX_0..n */
    GLvector1ui *IndexPtr[2];                   /* VERT_BIT_INDEX */
    struct gl_client_array *ColorPtr[2];                /* VERT_BIT_COLOR0 */
    struct gl_client_array *SecondaryColorPtr[2];/* VERT_BIT_COLOR1 */