fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 01:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix demos/fire, enable lazy vertex flushing

Browse source
This commit is contained in:
Keith Whitwell 2000-12-27 22:52:45 +00:00
parent ae8ec0b30d
commit 376d022e4a
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/main/dlist.c
View file

@ -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 );
}

6
src/mesa/main/enable.c
View file

@ -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 );
}

6
src/mesa/main/mtypes.h
View file

@ -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 { \

4
src/mesa/tnl/t_imm_exec.c
View file

@ -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;