diff options
| author | Brian Paul <[email protected]> | 2001-11-03 04:11:26 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2001-11-03 04:11:26 +0000 |
| commit | 85e7d7c1d889f867762c6f62070729089f1877ac (patch) | |
| tree | 493e9e14c635d639babd10a7ea38233d6c8eddb4 /src/mesa/main | |
| parent | dc31d67c0e48a8380baad738bec2673416c44911 (diff) | |
fix error in error checking conditional (bug 476846)
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/teximage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 7838577db3d..3e955c70047 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1,4 +1,4 @@ -/* $Id: teximage.c,v 1.104 2001/09/18 23:06:14 kschultz Exp $ */ +/* $Id: teximage.c,v 1.105 2001/11/03 04:11:26 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -665,7 +665,7 @@ texture_error_check( GLcontext *ctx, GLenum target, _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage2D(target)" ); return GL_TRUE; } - if (target == GL_PROXY_TEXTURE_2D && target == GL_TEXTURE_2D) + if (target == GL_PROXY_TEXTURE_2D || target == GL_TEXTURE_2D) maxLevels = ctx->Const.MaxTextureLevels; else maxLevels = ctx->Const.MaxCubeTextureLevels; |