diff options
| author | Eric Anholt <eric@anholt.net> | 2013-01-16 16:20:38 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-01-21 21:26:47 -0800 |
| commit | a9754793dab4b24c09cae21c29f902ce0e53319a (patch) | |
| tree | e8bba535d85fecc8f1608c40d24e1e26da73520e /src/mesa/main/attrib.c | |
| parent | c572251417ef20d1d560b849931321a42b1be578 (diff) | |
| download | external_mesa3d-a9754793dab4b24c09cae21c29f902ce0e53319a.zip external_mesa3d-a9754793dab4b24c09cae21c29f902ce0e53319a.tar.gz external_mesa3d-a9754793dab4b24c09cae21c29f902ce0e53319a.tar.bz2 | |
mesa: Drop manual checks for outside begin/end.
We now have a separate dispatch table for begin/end that prevent these
functions from being entered during that time. The
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVALs are left because I don't want to
change any return values or introduce new error-only stubs at this
point.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/attrib.c')
| -rw-r--r-- | src/mesa/main/attrib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index d6f298d..a951283 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -204,7 +204,6 @@ _mesa_PushAttrib(GLbitfield mask) struct gl_attrib_node *head; GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glPushAttrib %x\n", (int) mask); @@ -831,7 +830,7 @@ _mesa_PopAttrib(void) { struct gl_attrib_node *attr, *next; GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + FLUSH_VERTICES(ctx, 0); if (ctx->AttribStackDepth == 0) { _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopAttrib" ); @@ -1496,7 +1495,6 @@ _mesa_PushClientAttrib(GLbitfield mask) struct gl_attrib_node *head; GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); if (ctx->ClientAttribStackDepth >= MAX_CLIENT_ATTRIB_STACK_DEPTH) { _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushClientAttrib" ); @@ -1541,7 +1539,7 @@ _mesa_PopClientAttrib(void) struct gl_attrib_node *node, *next; GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + FLUSH_VERTICES(ctx, 0); if (ctx->ClientAttribStackDepth == 0) { _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopClientAttrib" ); |