diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-09 08:56:06 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-09 08:56:06 +0200 |
| commit | e957ce706e896f5ed802d81f26a2663578f8153f (patch) | |
| tree | 862fdd3b107b8c1bea4b84d80e60ffb41c30217d /mesalib/src/mesa/main | |
| parent | 6b15e563fb2212808ecff29bb72e0e941425b067 (diff) | |
| parent | c48e25635aaafefec0c7761d5310f7d2071fc50c (diff) | |
| download | vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.tar.gz vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.tar.bz2 vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index 225081578..d7156e670 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -1949,9 +1949,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions, { const GLint maxLevels = _mesa_max_texture_levels(ctx, target); GLint expectedSize; - GLenum choose_format; - GLenum choose_type; - GLenum proxy_format; GLenum error = GL_NO_ERROR; char *reason = ""; /* no error */ @@ -2015,10 +2012,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions, #endif default: - choose_format = GL_NONE; - choose_type = GL_NONE; - proxy_format = internalFormat; - /* check level */ if (level < 0 || level >= maxLevels) { reason = "level"; @@ -3405,8 +3398,8 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims, break; default: targetOK = GL_FALSE; - } - } + } + } else { assert(dims == 1 || dims == 3); /* no 1D or 3D compressed textures at this time */ |