diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-10 13:31:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-10 13:31:35 +0200 |
| commit | ac799961eb382e48c68ffda1e1a89b346eb97f81 (patch) | |
| tree | 96ab9494b7313d30b9b3d37480937fa07136b27b /mesalib/src/mesa/main/teximage.c | |
| parent | e957ce706e896f5ed802d81f26a2663578f8153f (diff) | |
| parent | 8c5587d9be904856f7e449a144c2819a8e310599 (diff) | |
| download | vcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.tar.gz vcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.tar.bz2 vcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 10 oct 2012
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index d7156e670..6c8bb85b8 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -1977,10 +1977,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions, case GL_PALETTE8_R5_G6_B5_OES: case GL_PALETTE8_RGBA4_OES: case GL_PALETTE8_RGB5_A1_OES: - _mesa_cpal_compressed_format_type(internalFormat, &choose_format, - &choose_type); - proxy_format = choose_format; - /* check level (note that level should be zero or less!) */ if (level > 0 || level < -maxLevels) { reason = "level"; |