Mesa (master): intel: Just look up image-> internal_format using _mesa_get_format_base_format

[Kristian Høgsberg]

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

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Thu Jul  5 00:07:15 2012 -0400

intel: Just look up image->internal_format using _mesa_get_format_base_format

Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/intel/intel_screen.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 1cbd249..5fc56f7 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -193,29 +193,25 @@ intel_create_image_from_name(__DRIscreen *screen,
     switch (format) {
     case __DRI_IMAGE_FORMAT_RGB565:
        image->format = MESA_FORMAT_RGB565;
-       image->internal_format = GL_RGB;
        break;
     case __DRI_IMAGE_FORMAT_XRGB8888:
        image->format = MESA_FORMAT_XRGB8888;
-       image->internal_format = GL_RGB;
        break;
     case __DRI_IMAGE_FORMAT_ARGB8888:
        image->format = MESA_FORMAT_ARGB8888;
-       image->internal_format = GL_RGBA;
        break;
     case __DRI_IMAGE_FORMAT_ABGR8888:
        image->format = MESA_FORMAT_RGBA8888_REV;
-       image->internal_format = GL_RGBA;
        break;
     case __DRI_IMAGE_FORMAT_XBGR8888:
        image->format = MESA_FORMAT_RGBX8888_REV;
-       image->internal_format = GL_RGB;
        break;
     default:
        free(image);
        return NULL;
     }
 
+    image->internal_format = _mesa_get_format_base_format(image->format);
     image->data = loaderPrivate;
     cpp = _mesa_get_format_bytes(image->format);
 
@@ -314,29 +310,25 @@ intel_create_image(__DRIscreen *screen,
    switch (format) {
    case __DRI_IMAGE_FORMAT_RGB565:
       image->format = MESA_FORMAT_RGB565;
-      image->internal_format = GL_RGB;
       break;
    case __DRI_IMAGE_FORMAT_XRGB8888:
       image->format = MESA_FORMAT_XRGB8888;
-      image->internal_format = GL_RGB;
       break;
    case __DRI_IMAGE_FORMAT_ARGB8888:
       image->format = MESA_FORMAT_ARGB8888;
-      image->internal_format = GL_RGBA;
       break;
     case __DRI_IMAGE_FORMAT_ABGR8888:
        image->format = MESA_FORMAT_RGBA8888_REV;
-       image->internal_format = GL_RGBA;
        break;
     case __DRI_IMAGE_FORMAT_XBGR8888:
        image->format = MESA_FORMAT_RGBX8888_REV;
-       image->internal_format = GL_RGB;
        break;
    default:
       free(image);
       return NULL;
    }
 
+   image->internal_format = _mesa_get_format_base_format(image->format);
    image->data = loaderPrivate;
    cpp = _mesa_get_format_bytes(image->format);