[Mesa-stable] [Mesa-dev] [PATCH 01/14] mesa: Turn get_readpixels_transfer_ops() in to a global function

[Iago Toral]

On Tue, 2015-06-16 at 11:15 -0700, Anuj Phogat wrote:
> This utility function is utilized in a later patch.
> 
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
> Cc: <mesa-stable at lists.freedesktop.org>
> ---
> Jenkins showed no piglit regressions with this series.
> 
>  src/mesa/main/readpix.c | 14 ++++++++------
>  src/mesa/main/readpix.h |  6 ++++++
>  2 files changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
> index a3357cd..caa2648 100644
> --- a/src/mesa/main/readpix.c
> +++ b/src/mesa/main/readpix.c
> @@ -64,9 +64,11 @@ _mesa_need_rgb_to_luminance_conversion(mesa_format texFormat, GLenum format)
>  /**
>   * Return transfer op flags for this ReadPixels operation.
>   */
> -static GLbitfield
> -get_readpixels_transfer_ops(const struct gl_context *ctx, mesa_format texFormat,
> -                            GLenum format, GLenum type, GLboolean uses_blit)
> +GLbitfield
> +_mesa_get_readpixels_transfer_ops(const struct gl_context *ctx,
> +                                  mesa_format texFormat,
> +                                  GLenum format, GLenum type,
> +                                  GLboolean uses_blit)
>  {
>     GLbitfield transferOps = ctx->_ImageTransferState;
>  
> @@ -169,7 +171,7 @@ _mesa_readpixels_needs_slow_path(const struct gl_context *ctx, GLenum format,
>        }
>  
>        /* And finally, see if there are any transfer ops. */
> -      return get_readpixels_transfer_ops(ctx, rb->Format, format, type,
> +      return _mesa_get_readpixels_transfer_ops(ctx, rb->Format, format, type,
>                                           uses_blit) != 0;

With the change, indentation for the second line needs to be fixed too.

Other than that,
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

>     }
>     return GL_FALSE;
> @@ -436,8 +438,8 @@ read_rgba_pixels( struct gl_context *ctx,
>     if (!rb)
>        return;
>  
> -   transferOps = get_readpixels_transfer_ops(ctx, rb->Format, format, type,
> -                                             GL_FALSE);
> +   transferOps = _mesa_get_readpixels_transfer_ops(ctx, rb->Format, format,
> +                                                   type, GL_FALSE);
>     /* Describe the dst format */
>     dst_is_integer = _mesa_is_enum_format_integer(format);
>     dst_stride = _mesa_image_row_stride(packing, width, format, type);
> diff --git a/src/mesa/main/readpix.h b/src/mesa/main/readpix.h
> index 1636dd9..f894036 100644
> --- a/src/mesa/main/readpix.h
> +++ b/src/mesa/main/readpix.h
> @@ -40,6 +40,12 @@ _mesa_readpixels_needs_slow_path(const struct gl_context *ctx, GLenum format,
>  extern GLboolean
>  _mesa_need_rgb_to_luminance_conversion(mesa_format texFormat, GLenum format);
>  
> +extern GLbitfield
> +_mesa_get_readpixels_transfer_ops(const struct gl_context *ctx,
> +                                  mesa_format texFormat,
> +                                  GLenum format, GLenum type,
> +                                  GLboolean uses_blit);
> +
>  extern void
>  _mesa_readpixels(struct gl_context *ctx,
>                   GLint x, GLint y, GLsizei width, GLsizei height,