bring in changes from dri tcl branch

1 files changed, 10 insertions, 5 deletions

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index e2224a1046b..99d477e7a4c 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.85 2002/04/02 16:15:17 brianp Exp $ */
+/* $Id: dlist.c,v 1.86 2002/04/09 16:56:50 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -5065,12 +5065,11 @@ _mesa_EndList( void )
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_CURRENT(ctx, 0);	/* must be called before assert */
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
    if (MESA_VERBOSE&VERBOSE_API)
       fprintf(stderr, "glEndList\n");
 
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx ); /* ??? */
-
    /* Check that a list is under construction */
    if (!ctx->CurrentListPtr) {
       _mesa_error( ctx, GL_INVALID_OPERATION, "glEndList" );
@@ -5097,7 +5096,6 @@ _mesa_EndList( void )
 
    ctx->CurrentDispatch = ctx->Exec;
    _glapi_set_dispatch( ctx->CurrentDispatch );
-
 }
 
 
@@ -5111,6 +5109,10 @@ _mesa_CallList( GLuint list )
    /* VERY IMPORTANT:  Save the CompileFlag status, turn it off, */
    /* execute the display list, and restore the CompileFlag. */
 
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      fprintf(stderr, "_mesa_CallList %d\n", list); 
+
 /*     mesa_print_display_list( list ); */
 
    save_compile_flag = ctx->CompileFlag;
@@ -5141,6 +5143,9 @@ _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists )
    GLint i;
    GLboolean save_compile_flag;
 
+   if (MESA_VERBOSE & VERBOSE_API)
+      fprintf(stderr, "_mesa_CallLists %d\n", n); 
+
    /* Save the CompileFlag status, turn it off, execute display list,
     * and restore the CompileFlag.
     */