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/vbo/vbo_exec_api.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/vbo/vbo_exec_api.c')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index f987439..985f220 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -658,8 +658,6 @@ vbo_exec_EvalMesh1(GLenum mode, GLint i1, GLint i2) GLfloat u, du; GLenum prim; - ASSERT_OUTSIDE_BEGIN_END(ctx); - switch (mode) { case GL_POINT: prim = GL_POINTS; @@ -696,8 +694,6 @@ vbo_exec_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) GLfloat u, du, v, dv, v1, u1; GLint i, j; - ASSERT_OUTSIDE_BEGIN_END(ctx); - switch (mode) { case GL_POINT: case GL_LINE: @@ -771,9 +767,6 @@ vbo_exec_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) static void GLAPIENTRY vbo_exec_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) { - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END(ctx); - CALL_Begin(GET_DISPATCH(), (GL_QUADS)); CALL_Vertex2f(GET_DISPATCH(), (x1, y1)); CALL_Vertex2f(GET_DISPATCH(), (x2, y1)); |