Mesa (master): mesa: remove FEATURE_ES test in _mesa_is_compressed_format()

Ian Romanick idr at kemper.freedesktop.org
Tue Oct 16 22:01:37 UTC 2012


Module: Mesa
Branch: master
Commit: 4936aadcd1a9c92f7815ee7367ee404dd58151f7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4936aadcd1a9c92f7815ee7367ee404dd58151f7

Author: Brian Paul <brianp at vmware.com>
Date:   Sat Sep 22 18:45:35 2012 -0600

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 at intel.com>

---

 src/mesa/main/glformats.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index ccdf56b..ba79f19 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;
    }




More information about the mesa-commit mailing list