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/viewport.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/viewport.c')
-rw-r--r-- | src/mesa/main/viewport.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c index a58697a..92f04cd 100644 --- a/src/mesa/main/viewport.c +++ b/src/mesa/main/viewport.c @@ -46,7 +46,7 @@ void GLAPIENTRY _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + FLUSH_VERTICES(ctx, 0); _mesa_set_viewport(ctx, x, y, width, height); } @@ -116,7 +116,8 @@ void GLAPIENTRY _mesa_DepthRange(GLclampd nearval, GLclampd farval) { GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + + FLUSH_VERTICES(ctx, 0); if (MESA_VERBOSE&VERBOSE_API) _mesa_debug(ctx, "glDepthRange %f %f\n", nearval, farval); |