diff options
| author | Brian Paul <brianp@vmware.com> | 2009-11-17 22:17:55 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-11-17 22:28:50 -0700 |
| commit | 76def826e78f1718a71429389b27024f164d474c (patch) | |
| tree | b2d9d2bbd0312e8cd59f10691c2e1ab8dfc385e2 | |
| parent | 2f4411c983760849f005c59f900184f01bfc0c80 (diff) | |
mesa: remove old assertions, unneeded clear_teximage_fields() calls
| -rw-r--r-- | src/mesa/main/teximage.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 4cbe8207622..4a743ccbc71 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -945,6 +945,8 @@ _mesa_init_teximage_fields(GLcontext *ctx, GLenum target, img->DepthScale = (GLfloat) img->Depth; } + img->TexFormat = MESA_FORMAT_NONE; + img->FetchTexelc = NULL; img->FetchTexelf = NULL; } @@ -2132,9 +2134,6 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat, else { ctx->Driver.FreeTexImageData( ctx, texImage ); - ASSERT(texImage->Map.Data == NULL); - - clear_teximage_fields(texImage); /* not really needed, but helpful */ _mesa_init_teximage_fields(ctx, target, texImage, postConvWidth, 1, 1, border, internalFormat); @@ -2251,8 +2250,6 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat, else { ctx->Driver.FreeTexImageData( ctx, texImage ); - ASSERT(texImage->Map.Data == NULL); - clear_teximage_fields(texImage); /* not really needed, but helpful */ _mesa_init_teximage_fields(ctx, target, texImage, postConvWidth, postConvHeight, 1, border, internalFormat); @@ -2365,8 +2362,6 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat, else { ctx->Driver.FreeTexImageData( ctx, texImage ); - ASSERT(texImage->Map.Data == NULL); - clear_teximage_fields(texImage); /* not really needed, but helpful */ _mesa_init_teximage_fields(ctx, target, texImage, width, height, depth, border, internalFormat); @@ -2673,9 +2668,6 @@ _mesa_CopyTexImage1D( GLenum target, GLint level, else { ctx->Driver.FreeTexImageData( ctx, texImage ); - ASSERT(texImage->Map.Data == NULL); - - clear_teximage_fields(texImage); /* not really needed, but helpful */ _mesa_init_teximage_fields(ctx, target, texImage, postConvWidth, 1, 1, border, internalFormat); @@ -2751,9 +2743,6 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat, else { ctx->Driver.FreeTexImageData( ctx, texImage ); - ASSERT(texImage->Map.Data == NULL); - - clear_teximage_fields(texImage); /* not really needed, but helpful */ _mesa_init_teximage_fields(ctx, target, texImage, postConvWidth, postConvHeight, 1, border, internalFormat); |