From 64180de1bf0ab9afcb4e659daf3132aa5b37638c Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Tue, 7 Jun 2016 14:32:16 -0400 Subject: [PATCH] gallium: make image_view const MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rob Clark Reviewed-by: Nicolai Hähnle --- 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 785dde784c9..f618f0cc8d8 100644 --- a/src/gallium/drivers/ddebug/dd_context.c +++ b/src/gallium/drivers/ddebug/dd_context.c @@ -491,7 +491,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 53a5aca78cf..4f1002eefe8 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 4173d068733..b389a7703ff 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c @@ -1250,7 +1250,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; @@ -1318,7 +1318,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 55686e8b61e..e95556bf117 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 81bb7ca88ee..553a76a2c87 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 0412dd79f89..c1ad991eede 100644 --- a/src/gallium/drivers/trace/tr_context.c +++ b/src/gallium/drivers/trace/tr_context.c @@ -1709,7 +1709,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 67ee5cc6477..0c88e00de16 100644 --- a/src/gallium/include/pipe/p_context.h +++ b/src/gallium/include/pipe/p_context.h @@ -331,7 +331,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,