summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/teximage.c11
1 files changed, 10 insertions, 1 deletions
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) {