Mesa (master): mesa: consolidate assertions in teximage code
Brian Paul
brianp at kemper.freedesktop.org
Fri Nov 12 14:46:53 UTC 2010
Module: Mesa
Branch: master
Commit: 56b4819932b0a44bfef9e10ed5f55649534252a8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=56b4819932b0a44bfef9e10ed5f55649534252a8
Author: Brian Paul <brianp at vmware.com>
Date: Thu Nov 11 18:04:00 2010 -0700
mesa: consolidate assertions in teximage code
---
src/mesa/main/teximage.c | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 2e9410f..eec5eff 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2276,6 +2276,7 @@ _mesa_choose_texture_format(struct gl_context *ctx,
prevImage->InternalFormat == internalFormat) {
/* use the same format */
texImage->TexFormat = prevImage->TexFormat;
+ ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
return;
}
}
@@ -2350,8 +2351,6 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
width, border, format, type, pixels,
&ctx->Unpack, texObj, texImage);
- ASSERT(texImage->TexFormat);
-
_mesa_set_fetch_functions(texImage, 1);
check_gen_mipmap(ctx, target, texObj, level);
@@ -2460,8 +2459,6 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
width, height, border, format, type,
pixels, &ctx->Unpack, texObj, texImage);
- ASSERT(texImage->TexFormat);
-
_mesa_set_fetch_functions(texImage, 2);
check_gen_mipmap(ctx, target, texObj, level);
@@ -2574,8 +2571,6 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
width, height, depth, border, format, type,
pixels, &ctx->Unpack, texObj, texImage);
- ASSERT(texImage->TexFormat);
-
_mesa_set_fetch_functions(texImage, 3);
check_gen_mipmap(ctx, target, texObj, level);
@@ -2902,8 +2897,6 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
ctx->Driver.CopyTexImage1D(ctx, target, level, internalFormat,
x, y, width, border);
- ASSERT(texImage->TexFormat);
-
_mesa_set_fetch_functions(texImage, 1);
check_gen_mipmap(ctx, target, texObj, level);
@@ -2972,8 +2965,6 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
ctx->Driver.CopyTexImage2D(ctx, target, level, internalFormat,
x, y, width, height, border);
- ASSERT(texImage->TexFormat);
-
_mesa_set_fetch_functions(texImage, 2);
check_gen_mipmap(ctx, target, texObj, level);
More information about the mesa-commit
mailing list