From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Date: Mon, 19 Sep 2011 07:02:58 +0000 (+0800)
Subject: mesa: fix error handling for glEvalMesh1/2D
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=21b2895bd0df1b7b6f6defeff1dc2084152f51e5;p=mesa.git

mesa: fix error handling for glEvalMesh1/2D

According man page, trigger error when calling glEvalMesh1/2D inside
glBegin/glEnd.

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
---

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: