|
|
@@ -1,4 +1,4 @@ |
|
|
|
/* $Id: teximage.c,v 1.112 2002/09/03 18:05:17 brianp Exp $ */ |
|
|
|
/* $Id: teximage.c,v 1.113 2002/09/06 14:42:04 brianp Exp $ */ |
|
|
|
|
|
|
|
/* |
|
|
|
* Mesa 3-D graphics library |
|
|
@@ -2306,7 +2306,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level, |
|
|
|
struct gl_texture_image *texImage; |
|
|
|
|
|
|
|
if (texture_error_check(ctx, target, level, internalFormat, |
|
|
|
GL_NONE, GL_NONE, 1, width, height, 1, border)) { |
|
|
|
GL_NONE, GL_NONE, 2, width, height, 1, border)) { |
|
|
|
return; /* error in texture image was detected */ |
|
|
|
} |
|
|
|
|
|
|
@@ -2404,7 +2404,7 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level, |
|
|
|
struct gl_texture_image *texImage; |
|
|
|
|
|
|
|
if (texture_error_check(ctx, target, level, internalFormat, |
|
|
|
GL_NONE, GL_NONE, 1, width, height, depth, border)) { |
|
|
|
GL_NONE, GL_NONE, 3, width, height, depth, border)) { |
|
|
|
return; /* error in texture image was detected */ |
|
|
|
} |
|
|
|
|
|
|
@@ -2445,7 +2445,7 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level, |
|
|
|
else if (target == GL_PROXY_TEXTURE_3D) { |
|
|
|
/* Proxy texture: check for errors and update proxy state */ |
|
|
|
GLenum error = texture_error_check(ctx, target, level, internalFormat, |
|
|
|
GL_NONE, GL_NONE, 1, width, height, depth, border); |
|
|
|
GL_NONE, GL_NONE, 3, width, height, depth, border); |
|
|
|
if (!error) { |
|
|
|
struct gl_texture_unit *texUnit; |
|
|
|
struct gl_texture_image *texImage; |