diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2000-12-26 05:09:27 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2000-12-26 05:09:27 +0000 |
| commit | cab974cf6c2dbfbf5dd5d291e1aae0f8eeb34290 (patch) | |
| tree | 45385bd755d8e3876c54b2b0113636f5ceb7976a /src/mesa/main/dlist.h | |
| parent | d1ff1f6798b003a820f5de9fad835ff352f31afe (diff) | |
| download | external_mesa3d-cab974cf6c2dbfbf5dd5d291e1aae0f8eeb34290.zip external_mesa3d-cab974cf6c2dbfbf5dd5d291e1aae0f8eeb34290.tar.gz external_mesa3d-cab974cf6c2dbfbf5dd5d291e1aae0f8eeb34290.tar.bz2 | |
Major rework of tnl module
New array_cache module
Support 8 texture units in core mesa (now support 8 everywhere)
Rework core mesa statechange operations to avoid flushing on many
noop statechanges.
Diffstat (limited to 'src/mesa/main/dlist.h')
| -rw-r--r-- | src/mesa/main/dlist.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h index 5d6faf9..a8cd34d 100644 --- a/src/mesa/main/dlist.h +++ b/src/mesa/main/dlist.h @@ -1,4 +1,4 @@ -/* $Id: dlist.h,v 1.9 2000/11/24 15:21:59 keithw Exp $ */ +/* $Id: dlist.h,v 1.10 2000/12/26 05:09:28 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -32,6 +32,30 @@ #include "mtypes.h" +#define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval) \ +do { \ + if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) { \ + gl_error( ctx, GL_INVALID_OPERATION, "begin/end" ); \ + return retval; \ + } \ +} while (0) + +#define ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx) \ + ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx,) + +#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx) \ +do { \ + ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx); \ + FLUSH_VERTICES(ctx, 0); \ +} while (0) + +#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)\ +do { \ + ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval); \ + FLUSH_VERTICES(ctx, 0); \ +} while (0) + + extern void gl_init_lists( void ); extern void gl_destroy_list( GLcontext *ctx, GLuint list ); |