Mesa (master): teximage: Remove unnecessary compressed format check

Marek Olšák mareko at kemper.freedesktop.org
Tue Oct 9 12:42:38 UTC 2012


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

Author: Daniel Stone <daniel at fooishbar.org>
Date:   Tue Oct  9 14:41:38 2012 +1100

teximage: Remove unnecessary compressed format check

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 at fooishbar.org>
Signed-off-by: Marek Olšák <maraeo at gmail.com>

---

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

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index d7156e6..6c8bb85 100644
--- a/src/mesa/main/teximage.c
+++ b/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";




More information about the mesa-commit mailing list