Removed immediate struct's maybe_transform_vb pointer.

Call _mesa_maybe_transform_vb() directly.

diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index ce9243eeccdffe9ec02dbcb01a4f391ddab34269..da1ad431619187241bd56f3dafd2e284d7a9ef40 100644 (file)
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -1,4 +1,4 @@
-/* $Id: eval.c,v 1.10 2000/07/20 15:53:17 keithw Exp $ */
+/* $Id: eval.c,v 1.11 2000/09/11 18:49:06 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2718,7 +2718,7 @@ _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
    IM->Flag[count] |= VERT_EVAL_C1;                    \
    ASSIGN_4V(IM->Obj[count], x, 0, 0, 1);              \
    if (count == VB_MAX-1)                              \
-      IM->maybe_transform_vb( IM );                    \
+      _mesa_maybe_transform_vb( IM );                  \
 }
 
 #define EVALCOORD2(IM, x, y)                           \
@@ -2727,7 +2727,7 @@ _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
    IM->Flag[count] |= VERT_EVAL_C2;                    \
    ASSIGN_4V(IM->Obj[count], x, y, 0, 1);              \
    if (count == VB_MAX-1)                              \
-      IM->maybe_transform_vb( IM );                    \
+      _mesa_maybe_transform_vb( IM );                  \
 }
 
 #define EVALPOINT1(IM, x)                              \
@@ -2736,7 +2736,7 @@ _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
    IM->Flag[count] |= VERT_EVAL_P1;                    \
    ASSIGN_4V(IM->Obj[count], x, 0, 0, 1);              \
    if (count == VB_MAX-1)                              \
-      IM->maybe_transform_vb( IM );                    \
+      _mesa_maybe_transform_vb( IM );                  \
 }
  
 #define EVALPOINT2(IM, x, y)                           \
@@ -2745,7 +2745,7 @@ _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
    IM->Flag[count] |= VERT_EVAL_P2;                    \
    ASSIGN_4V(IM->Obj[count], x, y, 0, 1);              \
    if (count == VB_MAX-1)                              \
-      IM->maybe_transform_vb( IM );                    \
+      _mesa_maybe_transform_vb( IM );                  \
 }
 
 

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 072426c6ea018d0fbbc20a1cda3e510c4f476c46..d6889bb9966e17aa897224572d20e56c0533ff52 100644 (file)
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,4 +1,4 @@
-/* $Id: varray.c,v 1.22 2000/06/12 15:30:51 brianp Exp $ */
+/* $Id: varray.c,v 1.23 2000/09/11 18:49:06 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -509,7 +509,7 @@ void gl_exec_array_elements( GLcontext *ctx, struct immediate *IM,
    IM->FlushElt |= IM->ArrayEltFlush;                          \
    IM->Count = count += IM->ArrayIncr;                         \
    if (count == VB_MAX)                                                \
-      IM->maybe_transform_vb( IM );                            \
+      _mesa_maybe_transform_vb( IM );                          \
 }
 
 
@@ -787,7 +787,6 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
 
 
 /* KW: Exactly fakes the effects of calling glArrayElement multiple times.
- *     Compilation is handled via. the IM->maybe_transform_vb() callback.
  */
 #if 1
 #define DRAW_ELT(FUNC, TYPE)                           \
@@ -815,8 +814,9 @@ static void FUNC( GLcontext *ctx, GLenum mode,              \
       IM->Count = nr;                                  \
       j += nr - start;                                 \
                                                        \
-      if (j == count) gl_End( ctx );                   \
-      IM->maybe_transform_vb( IM );                    \
+      if (j == count)                                  \
+         gl_End( ctx );                                        \
+      _mesa_maybe_transform_vb( IM );                  \
    }                                                   \
 }
 #else