From 49e950262530c8b63aa516d9a57801f0466f9803 Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Tue, 9 Oct 2012 09:06:11 -0300 Subject: [PATCH] Revert "mesa: remove unused variables to fix compile warnings" This reverts commit cb72ec5fc55651af186e45942a1cd3e45eb5c359. The commit breaks the build as those variables are only used under #ifdef FEATURE_ES. Signed-off-by: Eduardo Lima (Etrunko) --- src/mesa/main/teximage.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index d7156e6..d917e15 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1949,6 +1949,9 @@ 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 */ @@ -2012,6 +2015,10 @@ 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"; -- 1.7.11.7