From: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu, 5 Jul 2012 04:07:15 +0000 (-0400)
Subject: intel: Just look up image->internal_format using _mesa_get_format_base_format
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=454fc07ddefe2b750d78c94e8d52a11a8741c42f;p=mesa.git

intel: Just look up image->internal_format using _mesa_get_format_base_format

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

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 1cbd249653f..5fc56f7ca20 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);