From 21b2895bd0df1b7b6f6defeff1dc2084152f51e5 Mon Sep 17 00:00:00 2001 From: Yuanhan Liu Date: Mon, 19 Sep 2011 15:02:58 +0800 Subject: [PATCH] mesa: fix error handling for glEvalMesh1/2D According man page, trigger error when calling glEvalMesh1/2D inside glBegin/glEnd. Signed-off-by: Yuanhan Liu Signed-off-by: Brian Paul --- src/mesa/main/api_noop.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c index 7d3d3327279..c4ac95c986a 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: -- 2.11.0