From 1271424615b62544662a606bb23f6d7117a8b0e7 Mon Sep 17 00:00:00 2001
From: Marek Olšák <maraeo@gmail.com>
Date: Wed, 27 Apr 2011 12:52:10 +0200
Subject: mesa, util: move RGB9E5 conversion functions to gallium/util

Also use MAX3 and incorporate Ian's suggestion in texformat.c.

I don't think wrapping u_format_rgb9e5.h in another header and thus making it
more complicated is worth it.
---
 src/mesa/main/texformat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main/texformat.c')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 3520f24382f..15fa61f9f79 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -385,8 +385,8 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
    if (ctx->Extensions.EXT_texture_shared_exponent) {
       switch (internalFormat) {
          case GL_RGB9_E5:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_RGB9_E5_FLOAT);
-            break;
+            ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_RGB9_E5_FLOAT]);
+            return MESA_FORMAT_RGB9_E5_FLOAT;
          default:
             ; /* fallthrough */
       }
-- 
cgit v1.2.3