[PATCH 6/8] dri/i915,dri/i965: Use driGLFormatToImageFormat and driImageFormatToGLFormat

[Kristian Høgsberg]

On Mon, Nov 04, 2013 at 06:23:26PM -0800, Keith Packard wrote:
> Remove private versions of these functions

Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>

> Signed-off-by: Keith Packard <keithp at keithp.com>
> ---
>  src/mesa/drivers/dri/i915/intel_screen.c | 53 ++-------------------------
>  src/mesa/drivers/dri/i965/intel_screen.c | 63 ++------------------------------
>  2 files changed, 8 insertions(+), 108 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
> index 085e894..12113c7 100644
> --- a/src/mesa/drivers/dri/i915/intel_screen.c
> +++ b/src/mesa/drivers/dri/i915/intel_screen.c
> @@ -244,32 +244,8 @@ intel_allocate_image(int dri_format, void *loaderPrivate)
>      image->dri_format = dri_format;
>      image->offset = 0;
>  
> -    switch (dri_format) {
> -    case __DRI_IMAGE_FORMAT_RGB565:
> -       image->format = MESA_FORMAT_RGB565;
> -       break;
> -    case __DRI_IMAGE_FORMAT_XRGB8888:
> -       image->format = MESA_FORMAT_XRGB8888;
> -       break;
> -    case __DRI_IMAGE_FORMAT_ARGB8888:
> -       image->format = MESA_FORMAT_ARGB8888;
> -       break;
> -    case __DRI_IMAGE_FORMAT_ABGR8888:
> -       image->format = MESA_FORMAT_RGBA8888_REV;
> -       break;
> -    case __DRI_IMAGE_FORMAT_XBGR8888:
> -       image->format = MESA_FORMAT_RGBX8888_REV;
> -       break;
> -    case __DRI_IMAGE_FORMAT_R8:
> -       image->format = MESA_FORMAT_R8;
> -       break;
> -    case __DRI_IMAGE_FORMAT_GR88:
> -       image->format = MESA_FORMAT_GR88;
> -       break;
> -    case __DRI_IMAGE_FORMAT_NONE:
> -       image->format = MESA_FORMAT_NONE;
> -       break;
> -    default:
> +    image->format = driImageFormatToGLFormat(dri_format);
> +    if (image->format == 0) {
>         free(image);
>         return NULL;
>      }
> @@ -318,27 +294,6 @@ intel_setup_image_from_dimensions(__DRIimage *image)
>     image->tile_y = 0;
>  }
>  
> -static inline uint32_t
> -intel_dri_format(GLuint format)
> -{
> -   switch (format) {
> -   case MESA_FORMAT_RGB565:
> -      return __DRI_IMAGE_FORMAT_RGB565;
> -   case MESA_FORMAT_XRGB8888:
> -      return __DRI_IMAGE_FORMAT_XRGB8888;
> -   case MESA_FORMAT_ARGB8888:
> -      return __DRI_IMAGE_FORMAT_ARGB8888;
> -   case MESA_FORMAT_RGBA8888_REV:
> -      return __DRI_IMAGE_FORMAT_ABGR8888;
> -   case MESA_FORMAT_R8:
> -      return __DRI_IMAGE_FORMAT_R8;
> -   case MESA_FORMAT_RG88:
> -      return __DRI_IMAGE_FORMAT_GR88;
> -   }
> -
> -   return MESA_FORMAT_NONE;
> -}
> -
>  static __DRIimage *
>  intel_create_image_from_name(__DRIscreen *screen,
>  			     int width, int height, int format,
> @@ -396,7 +351,7 @@ intel_create_image_from_renderbuffer(__DRIcontext *context,
>     image->data = loaderPrivate;
>     intel_region_reference(&image->region, irb->mt->region);
>     intel_setup_image_from_dimensions(image);
> -   image->dri_format = intel_dri_format(image->format);
> +   image->dri_format = driGLFormatToImageFormat(image->format);
>  
>     rb->NeedsFinishRenderTexture = true;
>     return image;
> @@ -450,7 +405,7 @@ intel_create_image_from_texture(__DRIcontext *context, int target,
>     image->format = obj->Image[face][level]->TexFormat;
>     image->data = loaderPrivate;
>     intel_setup_image_from_mipmap_tree(intel, image, iobj->mt, level, zoffset);
> -   image->dri_format = intel_dri_format(image->format);
> +   image->dri_format = driGLFormatToImageFormat(image->format);
>     if (image->dri_format == MESA_FORMAT_NONE) {
>        *error = __DRI_IMAGE_ERROR_BAD_PARAMETER;
>        free(image);
> diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
> index b89b1a5..f9339c1 100644
> --- a/src/mesa/drivers/dri/i965/intel_screen.c
> +++ b/src/mesa/drivers/dri/i965/intel_screen.c
> @@ -298,38 +298,8 @@ intel_allocate_image(int dri_format, void *loaderPrivate)
>      image->dri_format = dri_format;
>      image->offset = 0;
>  
> -    switch (dri_format) {
> -    case __DRI_IMAGE_FORMAT_RGB565:
> -       image->format = MESA_FORMAT_RGB565;
> -       break;
> -    case __DRI_IMAGE_FORMAT_XRGB8888:
> -       image->format = MESA_FORMAT_XRGB8888;
> -       break;
> -    case __DRI_IMAGE_FORMAT_ARGB2101010:
> -       image->format = MESA_FORMAT_ARGB2101010;
> -       break;
> -    case __DRI_IMAGE_FORMAT_XRGB2101010:
> -       image->format = MESA_FORMAT_XRGB2101010_UNORM;
> -       break;
> -    case __DRI_IMAGE_FORMAT_ARGB8888:
> -       image->format = MESA_FORMAT_ARGB8888;
> -       break;
> -    case __DRI_IMAGE_FORMAT_ABGR8888:
> -       image->format = MESA_FORMAT_RGBA8888_REV;
> -       break;
> -    case __DRI_IMAGE_FORMAT_XBGR8888:
> -       image->format = MESA_FORMAT_RGBX8888_REV;
> -       break;
> -    case __DRI_IMAGE_FORMAT_R8:
> -       image->format = MESA_FORMAT_R8;
> -       break;
> -    case __DRI_IMAGE_FORMAT_GR88:
> -       image->format = MESA_FORMAT_GR88;
> -       break;
> -    case __DRI_IMAGE_FORMAT_NONE:
> -       image->format = MESA_FORMAT_NONE;
> -       break;
> -    default:
> +    image->format = driImageFormatToGLFormat(dri_format);
> +    if (image->format == 0) {
>         free(image);
>         return NULL;
>      }
> @@ -381,31 +351,6 @@ intel_setup_image_from_dimensions(__DRIimage *image)
>     image->has_depthstencil = false;
>  }
>  
> -static inline uint32_t
> -intel_dri_format(GLuint format)
> -{
> -   switch (format) {
> -   case MESA_FORMAT_RGB565:
> -      return __DRI_IMAGE_FORMAT_RGB565;
> -   case MESA_FORMAT_XRGB8888:
> -      return __DRI_IMAGE_FORMAT_XRGB8888;
> -   case MESA_FORMAT_ARGB8888:
> -      return __DRI_IMAGE_FORMAT_ARGB8888;
> -   case MESA_FORMAT_RGBA8888_REV:
> -      return __DRI_IMAGE_FORMAT_ABGR8888;
> -   case MESA_FORMAT_R8:
> -      return __DRI_IMAGE_FORMAT_R8;
> -   case MESA_FORMAT_RG88:
> -      return __DRI_IMAGE_FORMAT_GR88;
> -   case MESA_FORMAT_XRGB2101010_UNORM:
> -      return __DRI_IMAGE_FORMAT_XRGB2101010;
> -   case MESA_FORMAT_ARGB2101010:
> -      return __DRI_IMAGE_FORMAT_ARGB2101010;
> -   }
> -
> -   return MESA_FORMAT_NONE;
> -}
> -
>  static __DRIimage *
>  intel_create_image_from_name(__DRIscreen *screen,
>  			     int width, int height, int format,
> @@ -464,7 +409,7 @@ intel_create_image_from_renderbuffer(__DRIcontext *context,
>     image->data = loaderPrivate;
>     intel_region_reference(&image->region, irb->mt->region);
>     intel_setup_image_from_dimensions(image);
> -   image->dri_format = intel_dri_format(image->format);
> +   image->dri_format = driGLFormatToImageFormat(image->format);
>     image->has_depthstencil = irb->mt->stencil_mt? true : false;
>  
>     rb->NeedsFinishRenderTexture = true;
> @@ -519,7 +464,7 @@ intel_create_image_from_texture(__DRIcontext *context, int target,
>     image->format = obj->Image[face][level]->TexFormat;
>     image->data = loaderPrivate;
>     intel_setup_image_from_mipmap_tree(brw, image, iobj->mt, level, zoffset);
> -   image->dri_format = intel_dri_format(image->format);
> +   image->dri_format = driGLFormatToImageFormat(image->format);
>     image->has_depthstencil = iobj->mt->stencil_mt? true : false;
>     if (image->dri_format == MESA_FORMAT_NONE) {
>        *error = __DRI_IMAGE_ERROR_BAD_PARAMETER;
> -- 
> 1.8.4.2
>