fix incorrect texcoord attribute index

[mesa.git] / src / mesa / array_cache / ac_context.c

diff --git a/src/mesa/array_cache/ac_context.c b/src/mesa/array_cache/ac_context.c
index e22f771b674dc8be4dbd7a7ea3b6e3eda9e05bb0..ebf3a3dc47b3069f0a218ad6ce67375629a293f2 100644 (file)
--- a/src/mesa/array_cache/ac_context.c
+++ b/src/mesa/array_cache/ac_context.c
@@ -93,7 +93,7 @@ static void _ac_fallbacks_init( GLcontext *ctx )
 
    cl = &ac->Fallback.Index;
    cl->Size = 1;
-   cl->Type = GL_UNSIGNED_INT;
+   cl->Type = GL_FLOAT;
    cl->Stride = 0;
    cl->StrideB = 0;
    cl->Ptr = (GLubyte *) &ctx->Current.Index;
@@ -217,9 +217,9 @@ static void _ac_cache_init( GLcontext *ctx )
 
    cl = &ac->Cache.Index;
    cl->Size = 1;
-   cl->Type = GL_UNSIGNED_INT;
+   cl->Type = GL_FLOAT;
    cl->Stride = 0;
-   cl->StrideB = sizeof(GLuint);
+   cl->StrideB = sizeof(GLfloat);
    cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size );
    cl->Enabled = 1;
    cl->Flags = 0;
@@ -336,28 +336,28 @@ void _ac_DestroyContext( GLcontext *ctx )
     * not an offset into a buffer object.
     */
    if (ac->Cache.Vertex.Ptr && ac->Cache.Vertex.BufferObj == nullObj)
-      FREE( ac->Cache.Vertex.Ptr );
+      FREE( (void *) ac->Cache.Vertex.Ptr );
    if (ac->Cache.Normal.Ptr && ac->Cache.Normal.BufferObj == nullObj)
-      FREE( ac->Cache.Normal.Ptr );
+      FREE( (void *) ac->Cache.Normal.Ptr );
    if (ac->Cache.Color.Ptr && ac->Cache.Color.BufferObj == nullObj)
-      FREE( ac->Cache.Color.Ptr );
+      FREE( (void *) ac->Cache.Color.Ptr );
    if (ac->Cache.SecondaryColor.Ptr && ac->Cache.SecondaryColor.BufferObj == nullObj)
-      FREE( ac->Cache.SecondaryColor.Ptr );
+      FREE( (void *) ac->Cache.SecondaryColor.Ptr );
    if (ac->Cache.EdgeFlag.Ptr && ac->Cache.EdgeFlag.BufferObj == nullObj)
-      FREE( ac->Cache.EdgeFlag.Ptr );
+      FREE( (void *) ac->Cache.EdgeFlag.Ptr );
    if (ac->Cache.Index.Ptr && ac->Cache.Index.BufferObj == nullObj)
-      FREE( ac->Cache.Index.Ptr );
+      FREE( (void *) ac->Cache.Index.Ptr );
    if (ac->Cache.FogCoord.Ptr && ac->Cache.FogCoord.BufferObj == nullObj)
-      FREE( ac->Cache.FogCoord.Ptr );
+      FREE( (void *) ac->Cache.FogCoord.Ptr );
 
    for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
       if (ac->Cache.TexCoord[i].Ptr && ac->Cache.TexCoord[i].BufferObj == nullObj)
-        FREE( ac->Cache.TexCoord[i].Ptr );
+        FREE( (void *) ac->Cache.TexCoord[i].Ptr );
    }
 
    for (i = 0; i < VERT_ATTRIB_MAX; i++) {
       if (ac->Cache.Attrib[i].Ptr && ac->Cache.Attrib[i].BufferObj == nullObj)
-        FREE( ac->Cache.Attrib[i].Ptr );
+        FREE( (void *) ac->Cache.Attrib[i].Ptr );
    }
 
    if (ac->Elts)