Module: Mesa Branch: 7.11 Commit: 23a3753a287521ab35eb9ee93f8bc00311465a8b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=23a3753a287521ab35eb9ee93f8bc00311465a8b
Author: Yuanhan Liu <[email protected]> Date: Mon Sep 19 15:02:58 2011 +0800 mesa: fix error handling for glEvalMesh1/2D According man page, trigger error when calling glEvalMesh1/2D inside glBegin/glEnd. Signed-off-by: Yuanhan Liu <[email protected]> Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit 21b2895bd0df1b7b6f6defeff1dc2084152f51e5) --- src/mesa/main/api_noop.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c index 7d3d332..c4ac95c 100644 --- a/src/mesa/main/api_noop.c +++ b/src/mesa/main/api_noop.c @@ -892,6 +892,8 @@ _mesa_noop_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; @@ -930,6 +932,8 @@ _mesa_noop_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: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
