mesa: remove FEATURE_ES test in _mesa_is_compressed_format()
authorBrian Paul <brianp@vmware.com>
Sun, 23 Sep 2012 00:45:35 +0000 (18:45 -0600)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 16 Oct 2012 21:57:20 +0000 (14:57 -0700)
The code already has a runtime ES1 test.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/main/glformats.c

index ccdf56b4f6eb7c5d22a6a2b9c5b4361956844b2e..ba79f193b3f93383aa275ea58a19fbc5f07dc2ec 100644 (file)
@@ -829,7 +829,6 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format)
    case GL_ETC1_RGB8_OES:
       return _mesa_is_gles(ctx)
          && ctx->Extensions.OES_compressed_ETC1_RGB8_texture;
-#if FEATURE_ES
    case GL_PALETTE4_RGB8_OES:
    case GL_PALETTE4_RGBA8_OES:
    case GL_PALETTE4_R5_G6_B5_OES:
@@ -841,7 +840,6 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format)
    case GL_PALETTE8_RGBA4_OES:
    case GL_PALETTE8_RGB5_A1_OES:
       return ctx->API == API_OPENGLES;
-#endif
    default:
       return GL_FALSE;
    }