From: Brian Paul <brianp@vmware.com>
Date: Sun, 23 Sep 2012 00:45:35 +0000 (-0600)
Subject: mesa: remove FEATURE_ES test in _mesa_is_compressed_format()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4936aadcd1a9c92f7815ee7367ee404dd58151f7;p=mesa.git

mesa: remove FEATURE_ES test in _mesa_is_compressed_format()

The code already has a runtime ES1 test.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index ccdf56b4f6e..ba79f193b3f 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -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;
    }