aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-08-17 10:55:40 +0200
committermarha <marha@users.sourceforge.net>2012-08-17 10:55:40 +0200
commit6d3ef5c3fe5b69e59e3511202db6a66f71c2f234 (patch)
tree3830d989b529135e92edb6004aa368f287ed20c5 /mesalib/src/mesa/drivers
parentcf506c799c2281867a28ac33ac985994918bc0ba (diff)
parent5d9b8cf0e4054e774f906cde9dd6b61ceca72d44 (diff)
downloadvcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.tar.gz
vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.tar.bz2
vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/drivers')
-rw-r--r--mesalib/src/mesa/drivers/common/meta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index ca01a3301..db49d90ea 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -3162,7 +3162,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
static GLenum
get_temp_image_type(struct gl_context *ctx, gl_format format)
{
- GLenum baseFormat, type;
+ GLenum baseFormat;
baseFormat = _mesa_get_format_base_format(format);