diff options
| author | Brian Paul <[email protected]> | 2000-03-24 23:59:06 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2000-03-24 23:59:06 +0000 |
| commit | 9fd2b0a698163b397b0a17493e52b27273e51b63 (patch) | |
| tree | 0c48b74426f8e69fb8fb641ec849969fa3b68156 | |
| parent | d03dc2547756f5ed0b5538646c75e88f1fd7b526 (diff) | |
fixed a Driver.TexImage call typo, misc clean-up
| -rw-r--r-- | src/mesa/main/teximage.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index d40655c1392..d52b051d7fa 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1,4 +1,3 @@ -/* $Id: teximage.c,v 1.25 2000/03/23 16:23:14 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -642,7 +641,7 @@ texture_error_check( GLcontext *ctx, GLenum target, } /* Border */ - if (border!=0 && border!=1) { + if (border != 0 && border != 1) { if (!isProxy) { char message[100]; sprintf(message, "glTexImage%dD(border)", dimensions); @@ -687,7 +686,7 @@ texture_error_check( GLcontext *ctx, GLenum target, } /* Level */ - if (level<0 || level>=ctx->Const.MaxTextureLevels) { + if (level < 0 || level >= ctx->Const.MaxTextureLevels) { if (!isProxy) { char message[100]; sprintf(message, "glTexImage%dD(level)", dimensions); @@ -1788,7 +1787,7 @@ _mesa_TexSubImage2D( GLenum target, GLint level, texImage->IntFormat, texImage); } else if (ctx->Driver.TexImage) { - (*ctx->Driver.TexImage)(ctx, GL_TEXTURE_1D, texObj, + (*ctx->Driver.TexImage)(ctx, GL_TEXTURE_2D, texObj, level, texImage->IntFormat, texImage ); } #endif @@ -2063,7 +2062,7 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level, if (teximage->Data) { copy_tex_sub_image(ctx, teximage, width, 1, x, y, xoffset, 0, 0); /* tell driver about the change */ - /* XXX call Driver.TexSubImage instead? */ + /* XXX this is obsolete */ if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, texUnit->CurrentD[1], @@ -2100,7 +2099,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level, copy_tex_sub_image(ctx, teximage, width, height, x, y, xoffset, yoffset, 0); /* tell driver about the change */ - /* XXX call Driver.TexSubImage instead? */ + /* XXX this is obsolete */ if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, texUnit->CurrentD[2], @@ -2137,7 +2136,7 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level, copy_tex_sub_image(ctx, teximage, width, height, x, y, xoffset, yoffset, zoffset); /* tell driver about the change */ - /* XXX call Driver.TexSubImage instead? */ + /* XXX this is obsolete */ if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D, texUnit->CurrentD[3], |