summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-07-07 17:01:18 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-07-07 17:01:18 +0000
commitf6e76fe9b5c4c57ac6dc81143b4474ebfee879d2 (patch)
treea81a1353e47f1ee4665832762b8573e5352b40a8 /src/mesa
parentef751eb08b055d3c5b86ee10edc834a8767b7bc3 (diff)
fix conformance glitch introduced with NPOT extension
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/teximage.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index d731e12ad3..de28839463 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1015,6 +1015,14 @@ texture_error_check( GLcontext *ctx, GLenum target,
return GL_TRUE;
}
+ if (width < 1 || height < 1 || depth < 1) {
+ if (!isProxy) {
+ _mesa_error(ctx, GL_INVALID_VALUE,
+ "glTexImage%dD(width, height or depth < 1)", dimensions);
+ }
+ return GL_TRUE;
+ }
+
/* Check target and call ctx->Driver.TestProxyTexImage() to check the
* level, width, height and depth.
*/