aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-09 08:50:49 +0200
committermarha <marha@users.sourceforge.net>2012-10-09 08:50:49 +0200
commitc48e25635aaafefec0c7761d5310f7d2071fc50c (patch)
tree604f86c42565fb75b496b4748661b3f29fae95ca /mesalib/src/mesa/main
parentde8397bc3d010bba24ec0c4d2e6249a769a86fc7 (diff)
downloadvcxsrv-c48e25635aaafefec0c7761d5310f7d2071fc50c.tar.gz
vcxsrv-c48e25635aaafefec0c7761d5310f7d2071fc50c.tar.bz2
vcxsrv-c48e25635aaafefec0c7761d5310f7d2071fc50c.zip
fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450
Diffstat (limited to 'mesalib/src/mesa/main')
-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 */