generate INVALID_OPERATION if active texture != 0 in glMap[12][fd]

diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index a992a3922e1d4148f072e3bea1f9f4c1fe0aa452..b1b2823a1372af0cfdbd92e34226d1afa44322da 100644 (file)
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -1,4 +1,4 @@
-/* $Id: eval.c,v 1.19 2001/03/12 00:48:37 gareth Exp $ */
+/* $Id: eval.c,v 1.20 2001/05/16 17:06:28 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -279,6 +279,12 @@ map1(GLenum target, GLfloat u1, GLfloat u2, GLint ustride,
       return;
    }
 
+   if (ctx->Texture.CurrentUnit != 0) {
+      /* See OpenGL 1.2.1 spec, section F.2.13 */
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glMap2(ACTIVE_TEXTURE != 0)" );
+      return;
+   }
+
    switch (target) {
       case GL_MAP1_VERTEX_3:
          map = &ctx->EvalMap.Map1Vertex3;
@@ -392,6 +398,12 @@ map2( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
       return;
    }
 
+   if (ctx->Texture.CurrentUnit != 0) {
+      /* See OpenGL 1.2.1 spec, section F.2.13 */
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glMap2(ACTIVE_TEXTURE != 0)" );
+      return;
+   }
+
    switch (target) {
       case GL_MAP2_VERTEX_3:
          map = &ctx->EvalMap.Map2Vertex3;