From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kristian =?iso-8859-1?Q?H=F8gsberg?= Subject: Re: [PATCH 6/8] dri/i915,dri/i965: Use driGLFormatToImageFormat and driImageFormatToGLFormat Date: Tue, 5 Nov 2013 14:37:16 -0800 Message-ID: <20131105223716.GC5220@tokamak.local> References: <1383618208-21310-1-git-send-email-keithp@keithp.com> <1383618208-21310-7-git-send-email-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-pd0-f179.google.com (mail-pd0-f179.google.com [209.85.192.179]) by gabe.freedesktop.org (Postfix) with ESMTP id 558C7EF77B for ; Tue, 5 Nov 2013 14:37:21 -0800 (PST) Content-Disposition: inline In-Reply-To: <1383618208-21310-7-git-send-email-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: Keith Packard Cc: mesa3d-dev@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Mon, Nov 04, 2013 at 06:23:26PM -0800, Keith Packard wrote: > Remove private versions of these functions Reviewed-by: Kristian H=F8gsberg > Signed-off-by: Keith Packard > --- > 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 *loaderPri= vate) > image->dri_format =3D dri_format; > image->offset =3D 0; > = > - switch (dri_format) { > - case __DRI_IMAGE_FORMAT_RGB565: > - image->format =3D MESA_FORMAT_RGB565; > - break; > - case __DRI_IMAGE_FORMAT_XRGB8888: > - image->format =3D MESA_FORMAT_XRGB8888; > - break; > - case __DRI_IMAGE_FORMAT_ARGB8888: > - image->format =3D MESA_FORMAT_ARGB8888; > - break; > - case __DRI_IMAGE_FORMAT_ABGR8888: > - image->format =3D MESA_FORMAT_RGBA8888_REV; > - break; > - case __DRI_IMAGE_FORMAT_XBGR8888: > - image->format =3D MESA_FORMAT_RGBX8888_REV; > - break; > - case __DRI_IMAGE_FORMAT_R8: > - image->format =3D MESA_FORMAT_R8; > - break; > - case __DRI_IMAGE_FORMAT_GR88: > - image->format =3D MESA_FORMAT_GR88; > - break; > - case __DRI_IMAGE_FORMAT_NONE: > - image->format =3D MESA_FORMAT_NONE; > - break; > - default: > + image->format =3D driImageFormatToGLFormat(dri_format); > + if (image->format =3D=3D 0) { > free(image); > return NULL; > } > @@ -318,27 +294,6 @@ intel_setup_image_from_dimensions(__DRIimage *image) > image->tile_y =3D 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 *co= ntext, > image->data =3D loaderPrivate; > intel_region_reference(&image->region, irb->mt->region); > intel_setup_image_from_dimensions(image); > - image->dri_format =3D intel_dri_format(image->format); > + image->dri_format =3D driGLFormatToImageFormat(image->format); > = > rb->NeedsFinishRenderTexture =3D true; > return image; > @@ -450,7 +405,7 @@ intel_create_image_from_texture(__DRIcontext *context= , int target, > image->format =3D obj->Image[face][level]->TexFormat; > image->data =3D loaderPrivate; > intel_setup_image_from_mipmap_tree(intel, image, iobj->mt, level, zof= fset); > - image->dri_format =3D intel_dri_format(image->format); > + image->dri_format =3D driGLFormatToImageFormat(image->format); > if (image->dri_format =3D=3D MESA_FORMAT_NONE) { > *error =3D __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 *loaderPri= vate) > image->dri_format =3D dri_format; > image->offset =3D 0; > = > - switch (dri_format) { > - case __DRI_IMAGE_FORMAT_RGB565: > - image->format =3D MESA_FORMAT_RGB565; > - break; > - case __DRI_IMAGE_FORMAT_XRGB8888: > - image->format =3D MESA_FORMAT_XRGB8888; > - break; > - case __DRI_IMAGE_FORMAT_ARGB2101010: > - image->format =3D MESA_FORMAT_ARGB2101010; > - break; > - case __DRI_IMAGE_FORMAT_XRGB2101010: > - image->format =3D MESA_FORMAT_XRGB2101010_UNORM; > - break; > - case __DRI_IMAGE_FORMAT_ARGB8888: > - image->format =3D MESA_FORMAT_ARGB8888; > - break; > - case __DRI_IMAGE_FORMAT_ABGR8888: > - image->format =3D MESA_FORMAT_RGBA8888_REV; > - break; > - case __DRI_IMAGE_FORMAT_XBGR8888: > - image->format =3D MESA_FORMAT_RGBX8888_REV; > - break; > - case __DRI_IMAGE_FORMAT_R8: > - image->format =3D MESA_FORMAT_R8; > - break; > - case __DRI_IMAGE_FORMAT_GR88: > - image->format =3D MESA_FORMAT_GR88; > - break; > - case __DRI_IMAGE_FORMAT_NONE: > - image->format =3D MESA_FORMAT_NONE; > - break; > - default: > + image->format =3D driImageFormatToGLFormat(dri_format); > + if (image->format =3D=3D 0) { > free(image); > return NULL; > } > @@ -381,31 +351,6 @@ intel_setup_image_from_dimensions(__DRIimage *image) > image->has_depthstencil =3D 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 *co= ntext, > image->data =3D loaderPrivate; > intel_region_reference(&image->region, irb->mt->region); > intel_setup_image_from_dimensions(image); > - image->dri_format =3D intel_dri_format(image->format); > + image->dri_format =3D driGLFormatToImageFormat(image->format); > image->has_depthstencil =3D irb->mt->stencil_mt? true : false; > = > rb->NeedsFinishRenderTexture =3D true; > @@ -519,7 +464,7 @@ intel_create_image_from_texture(__DRIcontext *context= , int target, > image->format =3D obj->Image[face][level]->TexFormat; > image->data =3D loaderPrivate; > intel_setup_image_from_mipmap_tree(brw, image, iobj->mt, level, zoffs= et); > - image->dri_format =3D intel_dri_format(image->format); > + image->dri_format =3D driGLFormatToImageFormat(image->format); > image->has_depthstencil =3D iobj->mt->stencil_mt? true : false; > if (image->dri_format =3D=3D MESA_FORMAT_NONE) { > *error =3D __DRI_IMAGE_ERROR_BAD_PARAMETER; > -- = > 1.8.4.2 > =