better handling of current attributes. Trivial dlist and varray tests work

3 files changed, 4 insertions, 17 deletions

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 852b9aaee98..d601ee461e6 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -114,40 +114,34 @@ _mesa_initialize_array_object( GLcontext *ctx,
    obj->Vertex.StrideB = 0;
    obj->Vertex.Ptr = NULL;
    obj->Vertex.Enabled = GL_FALSE;
-   obj->Vertex.Flags = CA_CLIENT_DATA;
    obj->Normal.Type = GL_FLOAT;
    obj->Normal.Stride = 0;
    obj->Normal.StrideB = 0;
    obj->Normal.Ptr = NULL;
    obj->Normal.Enabled = GL_FALSE;
-   obj->Normal.Flags = CA_CLIENT_DATA;
    obj->Color.Size = 4;
    obj->Color.Type = GL_FLOAT;
    obj->Color.Stride = 0;
    obj->Color.StrideB = 0;
    obj->Color.Ptr = NULL;
    obj->Color.Enabled = GL_FALSE;
-   obj->Color.Flags = CA_CLIENT_DATA;
    obj->SecondaryColor.Size = 4;
    obj->SecondaryColor.Type = GL_FLOAT;
    obj->SecondaryColor.Stride = 0;
    obj->SecondaryColor.StrideB = 0;
    obj->SecondaryColor.Ptr = NULL;
    obj->SecondaryColor.Enabled = GL_FALSE;
-   obj->SecondaryColor.Flags = CA_CLIENT_DATA;
    obj->FogCoord.Size = 1;
    obj->FogCoord.Type = GL_FLOAT;
    obj->FogCoord.Stride = 0;
    obj->FogCoord.StrideB = 0;
    obj->FogCoord.Ptr = NULL;
    obj->FogCoord.Enabled = GL_FALSE;
-   obj->FogCoord.Flags = CA_CLIENT_DATA;
    obj->Index.Type = GL_FLOAT;
    obj->Index.Stride = 0;
    obj->Index.StrideB = 0;
    obj->Index.Ptr = NULL;
    obj->Index.Enabled = GL_FALSE;
-   obj->Index.Flags = CA_CLIENT_DATA;
    for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
       obj->TexCoord[i].Size = 4;
       obj->TexCoord[i].Type = GL_FLOAT;
@@ -155,13 +149,11 @@ _mesa_initialize_array_object( GLcontext *ctx,
       obj->TexCoord[i].StrideB = 0;
       obj->TexCoord[i].Ptr = NULL;
       obj->TexCoord[i].Enabled = GL_FALSE;
-      obj->TexCoord[i].Flags = CA_CLIENT_DATA;
    }
    obj->EdgeFlag.Stride = 0;
    obj->EdgeFlag.StrideB = 0;
    obj->EdgeFlag.Ptr = NULL;
    obj->EdgeFlag.Enabled = GL_FALSE;
-   obj->EdgeFlag.Flags = CA_CLIENT_DATA;
    for (i = 0; i < VERT_ATTRIB_MAX; i++) {
       obj->VertexAttrib[i].Size = 4;
       obj->VertexAttrib[i].Type = GL_FLOAT;
@@ -170,7 +162,6 @@ _mesa_initialize_array_object( GLcontext *ctx,
       obj->VertexAttrib[i].Ptr = NULL;
       obj->VertexAttrib[i].Enabled = GL_FALSE;
       obj->VertexAttrib[i].Normalized = GL_FALSE;
-      obj->VertexAttrib[i].Flags = CA_CLIENT_DATA;
    }
 
 #if FEATURE_ARB_vertex_buffer_object
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 91268b596d2..bf86e6db7d2 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -53,7 +53,7 @@ static void
 client_state( GLcontext *ctx, GLenum cap, GLboolean state )
 {
    GLuint flag;
-   GLuint *var;
+   GLboolean *var;
 
    switch (cap) {
       case GL_VERTEX_ARRAY:
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 5a326ff0dc9..903779edae5 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1640,8 +1640,6 @@ struct gl_pixelstore_attrib
 };
 
 
-#define CA_CLIENT_DATA     0x1	/**< Data not allocated by mesa */
-
 
 /**
  * Client vertex array attributes
@@ -1653,14 +1651,12 @@ struct gl_client_array
    GLsizei Stride;		/**< user-specified stride */
    GLsizei StrideB;		/**< actual stride in bytes */
    const GLubyte *Ptr;          /**< Points to array data */
-   GLbitfield Enabled;		/**< one of the _NEW_ARRAY_ bits */
+   GLboolean Enabled;		/**< Enabled flag is a boolean */
    GLboolean Normalized;        /**< GL_ARB_vertex_program */
 
    /**< GL_ARB_vertex_buffer_object */
    struct gl_buffer_object *BufferObj;
    GLuint _MaxElement;
-
-   GLbitfield Flags;
 };
 
 
@@ -1681,8 +1677,8 @@ struct gl_array_object
    struct gl_client_array SecondaryColor;
    struct gl_client_array FogCoord;
    struct gl_client_array Index;
-   struct gl_client_array TexCoord[MAX_TEXTURE_COORD_UNITS];
    struct gl_client_array EdgeFlag;
+   struct gl_client_array TexCoord[MAX_TEXTURE_COORD_UNITS];
    /*@}*/
 
    /** Generic arrays for vertex programs/shaders */
@@ -2617,7 +2613,7 @@ struct matrix_stack
 #define _NEW_ARRAY_TEXCOORD_5       VERT_BIT_TEX5
 #define _NEW_ARRAY_TEXCOORD_6       VERT_BIT_TEX6
 #define _NEW_ARRAY_TEXCOORD_7       VERT_BIT_TEX7
-#define _NEW_ARRAY_ATTRIB_0         0x10000  /* start at bit 16 */
+#define _NEW_ARRAY_ATTRIB_0         VERT_BIT_GENERIC0  /* start at bit 16 */
 #define _NEW_ARRAY_ALL              0xffffffff