From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 26 Feb 2001 18:24:55 +0000 (+0000)
Subject: added a cube map error check
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1f57563b9dccfb6ce5026eaf5b7a418dc4dd52b9;p=mesa.git

added a cube map error check
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 279126f2d48..7eb8d9352b1 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,4 +1,4 @@
-/* $Id: teximage.c,v 1.78 2001/02/19 20:01:41 brianp Exp $ */
+/* $Id: teximage.c,v 1.79 2001/02/26 18:24:55 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -733,6 +733,15 @@ texture_error_check( GLcontext *ctx, GLenum target,
       return GL_TRUE;
    }
 
+   /* For cube map, width must equal height */
+   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
+       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
+      if (width != height) {
+         gl_error(ctx, GL_INVALID_VALUE, "glTexImage2D(width != height)");
+         return GL_TRUE;
+      }
+   }
+
    iformat = _mesa_base_tex_format( ctx, internalFormat );
    if (iformat < 0) {
       if (!isProxy) {