Merge branch 'master' into glsl-pp-rework-2

[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 b41cf93897aa8a544051e68fda6c6e05acfd3b6f..ebaae6335b942d906bacce86ae0dc9ac08d21a50 100644 (file)
--- a/src/mesa/tnl/t_context.h
+++ b/src/mesa/tnl/t_context.h
@@ -202,8 +202,6 @@ struct vertex_buffer
     * it that is one of VERT_ATTRIB_X.  For things only produced by TNL,
     * such as backface color or eye-space coordinates, they are stored
     * here.
-    * XXX some of these fields alias AttribPtr below and should be removed
-    * such as FogCoordPtr, etc.
     */
    GLuint      *Elts;                          
    GLvector4f  *EyePtr;                                /* _TNL_BIT_POS */
@@ -214,10 +212,9 @@ struct vertex_buffer
    GLubyte     *ClipMask;                      /* _TNL_BIT_POS */
    GLfloat     *NormalLengthPtr;               /* _TNL_BIT_NORMAL */
    GLboolean   *EdgeFlag;                      /* _TNL_BIT_EDGEFLAG */
-   GLvector4f  *BackfaceIndexPtr;               /* _TNL_BIT_INDEX */
-   GLvector4f  *ColorPtr[2];                   /* _TNL_BIT_COLOR0 */
-   GLvector4f  *SecondaryColorPtr[2];           /* _TNL_BIT_COLOR1 */
-   GLvector4f  *FogCoordPtr;                   /* _TNL_BIT_FOG */
+   GLvector4f  *BackfaceIndexPtr;
+   GLvector4f  *BackfaceColorPtr;
+   GLvector4f  *BackfaceSecondaryColorPtr;
 
    const struct _mesa_prim  *Primitive;                      
    GLuint      PrimitiveCount;