OSDN Git Service

teximage: Remove unnecessary compressed format check
authorDaniel Stone <daniel@fooishbar.org>
Tue, 9 Oct 2012 03:41:38 +0000 (14:41 +1100)
committerMarek Olšák <maraeo@gmail.com>
Tue, 9 Oct 2012 12:32:03 +0000 (14:32 +0200)
Ever since df4a88ac, the check for compressed formats has been
unnecessary.  And ever since cb72ec5f, the build has been broken with
FEATURE_ES.  Remove it, as it does nothing.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Marek Olšák <maraeo@gmail.com>
src/mesa/main/teximage.c

index d7156e6..6c8bb85 100644 (file)
@@ -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";