aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorYuanhan Liu <[email protected]>2011-09-19 15:02:58 +0800
committerBrian Paul <[email protected]>2011-09-19 08:11:51 -0600
commit21b2895bd0df1b7b6f6defeff1dc2084152f51e5 (patch)
treed09212778204cc9cf6c613c4d4c8efad7b583ebb /src/mesa
parentf534c1341347438ed7607b0afa12244df8f1cd0a (diff)
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]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/api_noop.c4
1 files changed, 4 insertions, 0 deletions
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: