From 898500c440785fba408ecdcf9c260cca6c2c6bcd Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 1 Apr 2018 14:04:04 -0400 Subject: radeonsi: remove r600_pipe_common::rebind_buffer Acked-by: Timothy Arceri --- src/gallium/drivers/radeonsi/si_descriptors.c | 8 +++++--- src/gallium/drivers/radeonsi/si_state.h | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/gallium/drivers/radeonsi') diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 38befa445d2..c198d5f816d 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -1610,8 +1610,11 @@ static void si_reset_buffer_resources(struct si_context *sctx, } } -static void si_rebind_buffer(struct pipe_context *ctx, struct pipe_resource *buf, - uint64_t old_va) +/* Update all resource bindings where the buffer is bound, including + * all resource descriptors. This is invalidate_buffer without + * the invalidation. */ +void si_rebind_buffer(struct pipe_context *ctx, struct pipe_resource *buf, + uint64_t old_va) { struct si_context *sctx = (struct si_context*)ctx; struct r600_resource *rbuffer = r600_resource(buf); @@ -2784,7 +2787,6 @@ void si_init_all_descriptors(struct si_context *sctx) sctx->b.b.delete_image_handle = si_delete_image_handle; sctx->b.b.make_image_handle_resident = si_make_image_handle_resident; sctx->b.invalidate_buffer = si_invalidate_buffer; - sctx->b.rebind_buffer = si_rebind_buffer; /* Shader user data. */ si_init_atom(sctx, &sctx->shader_pointers.atom, &sctx->atoms.s.shader_pointers, diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index d19045c5da2..5fcd30405bd 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -369,7 +369,8 @@ struct pb_slab *si_bindless_descriptor_slab_alloc(void *priv, unsigned heap, unsigned entry_size, unsigned group_index); void si_bindless_descriptor_slab_free(void *priv, struct pb_slab *pslab); - +void si_rebind_buffer(struct pipe_context *ctx, struct pipe_resource *buf, + uint64_t old_va); /* si_state.c */ struct si_shader_selector; -- cgit v1.2.3