X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Ftnl%2Ft_array_api.c;h=3aa91f9d906f194fda062530cc40c6dea94bab31;hb=5a382001224df9aad6137c825fbfc2d058b220b1;hp=e4f90756c5383ef871504bf44e7ddca31b31728a;hpb=eb7935c63b647df38325fcc77ce86587558fb7c5;p=mesa.git

diff --git a/src/mesa/tnl/t_array_api.c b/src/mesa/tnl/t_array_api.c
index e4f90756c53..3aa91f9d906 100644
--- a/src/mesa/tnl/t_array_api.c
+++ b/src/mesa/tnl/t_array_api.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.0
+ * Version:  6.1
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -52,10 +52,10 @@ static void fallback_drawarrays( GLcontext *ctx, GLenum mode, GLint start,
    assert(!ctx->CompileFlag);
    assert(ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1);
 
-   glBegin(mode);
-   for (i = start; i < count; i++) 
-      glArrayElement( i );
-   glEnd();
+   GL_CALL(Begin)(mode);
+   for (i = 0; i < count; i++) 
+       GL_CALL(ArrayElement)( start + i );
+   GL_CALL(End)();
 }
 
 
@@ -69,11 +69,11 @@ static void fallback_drawelements( GLcontext *ctx, GLenum mode, GLsizei count,
 
    /* Here, indices will already reflect the buffer object if active */
 
-   glBegin(mode);
+   GL_CALL(Begin)(mode);
    for (i = 0 ; i < count ; i++) {
-      glArrayElement( indices[i] );
+      GL_CALL(ArrayElement)( indices[i] );
    }
-   glEnd();
+   GL_CALL(End)();
 }
 
 
@@ -150,10 +150,10 @@ _tnl_DrawArrays(GLenum mode, GLint start, GLsizei count)
       /* Small primitives: attempt to share a vb (at the expense of
        * using the immediate interface).
       */
-      fallback_drawarrays( ctx, mode, start, start + count );
+      fallback_drawarrays( ctx, mode, start, count );
    } 
-   else if (start >= ctx->Array.LockFirst &&
-	    start + count <= ctx->Array.LockFirst + ctx->Array.LockCount) {
+   else if (start >= (GLint) ctx->Array.LockFirst &&
+	    start + count <= (GLint)(ctx->Array.LockFirst + ctx->Array.LockCount)) {
       
       struct tnl_prim prim;
 
@@ -233,7 +233,7 @@ _tnl_DrawArrays(GLenum mode, GLint start, GLsizei count)
 	    skip = 0;
 	 }
 	 else {
-	    fallback_drawarrays( ctx, mode, start, start + count );
+	    fallback_drawarrays( ctx, mode, start, count );
 	    return;
 	 }
       }
@@ -422,13 +422,13 @@ void _tnl_array_init( GLcontext *ctx )
 
    /* Setup vector pointers that will be used to bind arrays to VB's.
     */
-   _mesa_vector4f_init( &tmp->Obj, 0, 0 );
-   _mesa_vector4f_init( &tmp->Normal, 0, 0 );   
-   _mesa_vector4f_init( &tmp->FogCoord, 0, 0 );
-   _mesa_vector4f_init( &tmp->Index, 0, 0 );
+   _mesa_vector4f_init( &tmp->Obj, 0, NULL);
+   _mesa_vector4f_init( &tmp->Normal, 0, NULL);   
+   _mesa_vector4f_init( &tmp->FogCoord, 0, NULL);
+   _mesa_vector4f_init( &tmp->Index, 0, NULL);
 
    for (i = 0; i < ctx->Const.MaxTextureUnits; i++)
-      _mesa_vector4f_init( &tmp->TexCoord[i], 0, 0);
+      _mesa_vector4f_init( &tmp->TexCoord[i], 0, NULL);
 }
 
 
@@ -438,4 +438,5 @@ void _tnl_array_init( GLcontext *ctx )
  */
 void _tnl_array_destroy( GLcontext *ctx )
 {
+   (void) ctx;
 }