[Mesa-dev] [PATCH] meta: remove const qualifier on _mesa_meta_fb_tex_blit_begin()

[Ian Romanick]

On 01/12/2016 07:51 AM, Brian Paul wrote:
> To silence a compiler warning about a const/non-const mismatch.

It is weird that I didn't notice that before.  It is clearly there. :(

drivers/common/meta_blit.c:822:35: warning: passing argument 1 of ‘_mesa_reference_sampler_object’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
    _mesa_reference_sampler_object(ctx, &blit->samp_obj_save,
                                   ^
I usually copy-and-paste the compiler warning into the commit message,
but either way this patch is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>  src/mesa/drivers/common/meta.h      | 2 +-
>  src/mesa/drivers/common/meta_blit.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h
> index d7d8fd3..3691e7d 100644
> --- a/src/mesa/drivers/common/meta.h
> +++ b/src/mesa/drivers/common/meta.h
> @@ -453,7 +453,7 @@ _mesa_meta_in_progress(struct gl_context *ctx)
>  }
>  
>  extern void
> -_mesa_meta_fb_tex_blit_begin(const struct gl_context *ctx,
> +_mesa_meta_fb_tex_blit_begin(struct gl_context *ctx,
>                               struct fb_tex_blit_state *blit);
>  
>  extern void
> diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c
> index 78434cf..b414dce 100644
> --- a/src/mesa/drivers/common/meta_blit.c
> +++ b/src/mesa/drivers/common/meta_blit.c
> @@ -807,7 +807,7 @@ blitframebuffer_texture(struct gl_context *ctx,
>  }
>  
>  void
> -_mesa_meta_fb_tex_blit_begin(const struct gl_context *ctx,
> +_mesa_meta_fb_tex_blit_begin(struct gl_context *ctx,
>                               struct fb_tex_blit_state *blit)
>  {
>     /* None of the existing callers preinitialize fb_tex_blit_state to zeros,
>