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/api_validate.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/api_validate.c')
| -rw-r--r-- | src/mesa/main/api_validate.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index 133fb63..53b0021 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -313,7 +313,6 @@ _mesa_validate_DrawElements(struct gl_context *ctx, GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex) { - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); FLUSH_CURRENT(ctx, 0); /* From the GLES3 specification, section 2.14.2 (Transform Feedback @@ -380,7 +379,6 @@ _mesa_validate_MultiDrawElements(struct gl_context *ctx, { unsigned i; - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); FLUSH_CURRENT(ctx, 0); for (i = 0; i < primcount; i++) { @@ -444,7 +442,6 @@ _mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex) { - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); FLUSH_CURRENT(ctx, 0); /* From the GLES3 specification, section 2.14.2 (Transform Feedback @@ -514,7 +511,6 @@ _mesa_validate_DrawArrays(struct gl_context *ctx, { struct gl_transform_feedback_object *xfb_obj = ctx->TransformFeedback.CurrentObject; - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); FLUSH_CURRENT(ctx, 0); if (count <= 0) { @@ -568,7 +564,6 @@ _mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint fi { struct gl_transform_feedback_object *xfb_obj = ctx->TransformFeedback.CurrentObject; - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); FLUSH_CURRENT(ctx, 0); if (count <= 0) { @@ -637,7 +632,6 @@ _mesa_validate_DrawElementsInstanced(struct gl_context *ctx, const GLvoid *indices, GLsizei numInstances, GLint basevertex) { - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); FLUSH_CURRENT(ctx, 0); /* From the GLES3 specification, section 2.14.2 (Transform Feedback @@ -707,7 +701,6 @@ _mesa_validate_DrawTransformFeedback(struct gl_context *ctx, GLuint stream, GLsizei numInstances) { - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); FLUSH_CURRENT(ctx, 0); if (!_mesa_valid_prim_mode(ctx, mode, "glDrawTransformFeedback*(mode)")) { |