[Mesa-dev] [PATCH 04/10] gallium: make image_view const

[Nicolai Hähnle]

Patches 2-4:

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

On 14.06.2016 17:57, Rob Clark wrote:
> From: Rob Clark <robclark at freedesktop.org>
>
> Signed-off-by: Rob Clark <robclark at freedesktop.org>
> ---
>   src/gallium/drivers/ddebug/dd_context.c       | 2 +-
>   src/gallium/drivers/ilo/ilo_state.c           | 2 +-
>   src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 4 ++--
>   src/gallium/drivers/radeonsi/si_descriptors.c | 6 +++---
>   src/gallium/drivers/softpipe/sp_state_image.c | 2 +-
>   src/gallium/drivers/trace/tr_context.c        | 2 +-
>   src/gallium/include/pipe/p_context.h          | 2 +-
>   7 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/src/gallium/drivers/ddebug/dd_context.c b/src/gallium/drivers/ddebug/dd_context.c
> index 64b16f6..f72fd2f 100644
> --- a/src/gallium/drivers/ddebug/dd_context.c
> +++ b/src/gallium/drivers/ddebug/dd_context.c
> @@ -490,7 +490,7 @@ dd_context_set_sampler_views(struct pipe_context *_pipe, unsigned shader,
>   static void
>   dd_context_set_shader_images(struct pipe_context *_pipe, unsigned shader,
>                                unsigned start, unsigned num,
> -                             struct pipe_image_view *views)
> +                             const struct pipe_image_view *views)
>   {
>      struct dd_context *dctx = dd_context(_pipe);
>      struct pipe_context *pipe = dctx->pipe;
> diff --git a/src/gallium/drivers/ilo/ilo_state.c b/src/gallium/drivers/ilo/ilo_state.c
> index 53a5aca..4f1002e 100644
> --- a/src/gallium/drivers/ilo/ilo_state.c
> +++ b/src/gallium/drivers/ilo/ilo_state.c
> @@ -1851,7 +1851,7 @@ ilo_set_sampler_views(struct pipe_context *pipe, unsigned shader,
>   static void
>   ilo_set_shader_images(struct pipe_context *pipe, unsigned shader,
>                         unsigned start, unsigned count,
> -                      struct pipe_image_view *views)
> +                      const struct pipe_image_view *views)
>   {
>   #if 0
>      struct ilo_state_vector *vec = &ilo_context(pipe)->state_vector;
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
> index a0e01bd..0bd756f 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
> @@ -1233,7 +1233,7 @@ nvc0_set_compute_resources(struct pipe_context *pipe,
>   static bool
>   nvc0_bind_images_range(struct nvc0_context *nvc0, const unsigned s,
>                          unsigned start, unsigned nr,
> -                       struct pipe_image_view *pimages)
> +                       const struct pipe_image_view *pimages)
>   {
>      const unsigned end = start + nr;
>      unsigned mask = 0;
> @@ -1301,7 +1301,7 @@ nvc0_bind_images_range(struct nvc0_context *nvc0, const unsigned s,
>   static void
>   nvc0_set_shader_images(struct pipe_context *pipe, unsigned shader,
>                          unsigned start, unsigned nr,
> -                       struct pipe_image_view *images)
> +                       const struct pipe_image_view *images)
>   {
>      const unsigned s = nvc0_shader_stage(shader);
>      if (!nvc0_bind_images_range(nvc0_context(pipe), s, start, nr, images))
> diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
> index 55686e8..e95556b 100644
> --- a/src/gallium/drivers/radeonsi/si_descriptors.c
> +++ b/src/gallium/drivers/radeonsi/si_descriptors.c
> @@ -560,7 +560,7 @@ si_disable_shader_image(struct si_context *ctx, unsigned shader, unsigned slot)
>   }
>
>   static void
> -si_mark_image_range_valid(struct pipe_image_view *view)
> +si_mark_image_range_valid(const struct pipe_image_view *view)
>   {
>   	struct r600_resource *res = (struct r600_resource *)view->resource;
>   	const struct util_format_description *desc;
> @@ -578,7 +578,7 @@ si_mark_image_range_valid(struct pipe_image_view *view)
>
>   static void si_set_shader_image(struct si_context *ctx,
>   				unsigned shader,
> -				unsigned slot, struct pipe_image_view *view)
> +				unsigned slot, const struct pipe_image_view *view)
>   {
>   	struct si_screen *screen = ctx->screen;
>   	struct si_images_info *images = &ctx->images[shader];
> @@ -674,7 +674,7 @@ static void si_set_shader_image(struct si_context *ctx,
>   static void
>   si_set_shader_images(struct pipe_context *pipe, unsigned shader,
>   		     unsigned start_slot, unsigned count,
> -		     struct pipe_image_view *views)
> +		     const struct pipe_image_view *views)
>   {
>   	struct si_context *ctx = (struct si_context *)pipe;
>   	unsigned i, slot;
> diff --git a/src/gallium/drivers/softpipe/sp_state_image.c b/src/gallium/drivers/softpipe/sp_state_image.c
> index 81bb7ca..553a76a 100644
> --- a/src/gallium/drivers/softpipe/sp_state_image.c
> +++ b/src/gallium/drivers/softpipe/sp_state_image.c
> @@ -30,7 +30,7 @@ static void softpipe_set_shader_images(struct pipe_context *pipe,
>                                          unsigned shader,
>                                          unsigned start,
>                                          unsigned num,
> -                                       struct pipe_image_view *images)
> +                                       const struct pipe_image_view *images)
>   {
>      struct softpipe_context *softpipe = softpipe_context(pipe);
>      unsigned i;
> diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
> index 83b2a16..c484634 100644
> --- a/src/gallium/drivers/trace/tr_context.c
> +++ b/src/gallium/drivers/trace/tr_context.c
> @@ -1708,7 +1708,7 @@ static void trace_context_set_shader_buffers(struct pipe_context *_context,
>   static void trace_context_set_shader_images(struct pipe_context *_context,
>                                               unsigned shader,
>                                               unsigned start, unsigned nr,
> -                                            struct pipe_image_view *images)
> +                                            const struct pipe_image_view *images)
>   {
>      struct trace_context *tr_context = trace_context(_context);
>      struct pipe_context *context = tr_context->pipe;
> diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
> index 23306b2..24c947e 100644
> --- a/src/gallium/include/pipe/p_context.h
> +++ b/src/gallium/include/pipe/p_context.h
> @@ -326,7 +326,7 @@ struct pipe_context {
>       */
>      void (*set_shader_images)(struct pipe_context *, unsigned shader,
>                                unsigned start_slot, unsigned count,
> -                             struct pipe_image_view *images);
> +                             const struct pipe_image_view *images);
>
>      void (*set_vertex_buffers)( struct pipe_context *,
>                                  unsigned start_slot,
>