aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/teximage.c
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
-rw-r--r--mesalib/src/mesa/main/teximage.c11
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 */