fix demos/fire, enable lazy vertex flushing

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 85bb2f9..5d64b04 100644 (file)
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.55 2000/12/26 05:09:28 keithw Exp $ */
+/* $Id: dlist.c,v 1.56 2000/12/27 22:52:45 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -4811,6 +4811,7 @@ _mesa_EndList( void )
 
    ctx->CurrentDispatch = ctx->Exec;
    _glapi_set_dispatch( ctx->CurrentDispatch );
+
 }
 
 

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 7b66760..5806f9c 100644 (file)
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1,4 +1,4 @@
-/* $Id: enable.c,v 1.37 2000/12/26 05:09:28 keithw Exp $ */
+/* $Id: enable.c,v 1.38 2000/12/27 22:52:45 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -755,6 +755,8 @@ void
 _mesa_Enable( GLenum cap )
 {
    GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
    _mesa_set_enable( ctx, cap, GL_TRUE );
 }
 
@@ -764,6 +766,8 @@ void
 _mesa_Disable( GLenum cap )
 {
    GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
    _mesa_set_enable( ctx, cap, GL_FALSE );
 }
 

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 3a7c6b3..61e7068 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.7 2000/12/26 05:09:29 keithw Exp $ */
+/* $Id: mtypes.h,v 1.8 2000/12/27 22:52:45 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1652,10 +1652,10 @@ do {                                                            \
       gl_error( ctx, GL_INVALID_OPERATION, "begin/end" );      \
       return retval;                                           \
    }                                                           \
-} while (0); FLUSH_VERTICES(ctx, 0)
+} while (0)
 
 #define ASSERT_OUTSIDE_BEGIN_END(ctx) \
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx,); FLUSH_VERTICES(ctx, 0)
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx,)
 
 #define ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx)        \
 do {                                           \

diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c
index 80adbb4..f9b1212 100644 (file)
--- a/src/mesa/tnl/t_imm_exec.c
+++ b/src/mesa/tnl/t_imm_exec.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_exec.c,v 1.2 2000/12/27 21:49:40 keithw Exp $ */
+/* $Id: t_imm_exec.c,v 1.3 2000/12/27 22:52:45 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -412,6 +412,8 @@ void _tnl_execute_cassette( GLcontext *ctx, struct immediate *IM )
 
    _tnl_compute_orflag( IM );
 
+/*     _tnl_print_cassette( IM ); */
+
    /* Mark the last primitive:
     */
    IM->PrimitiveLength[IM->LastPrimitive] = IM->Count - IM->LastPrimitive;