From 238aeabce0e5cfd850279a68fe0c816adc175294 Mon Sep 17 00:00:00 2001 From: Andreas Hartmetz Date: Sat, 11 Jan 2014 15:47:07 +0100 Subject: radeonsi: Rename r600->si for structs in si_pipe.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_state.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gallium/drivers/radeonsi/si_state.h') diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 3002d56e536..aef0f559cc4 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -190,13 +190,13 @@ struct si_buffer_resources { } while(0) /* si_descriptors.c */ -void si_set_sampler_view(struct r600_context *rctx, unsigned shader, +void si_set_sampler_view(struct si_context *rctx, unsigned shader, unsigned slot, struct pipe_sampler_view *view, unsigned *view_desc); -void si_init_all_descriptors(struct r600_context *rctx); -void si_release_all_descriptors(struct r600_context *rctx); -void si_all_descriptors_begin_new_cs(struct r600_context *rctx); -void si_copy_buffer(struct r600_context *rctx, +void si_init_all_descriptors(struct si_context *rctx); +void si_release_all_descriptors(struct si_context *rctx); +void si_all_descriptors_begin_new_cs(struct si_context *rctx); +void si_copy_buffer(struct si_context *rctx, struct pipe_resource *dst, struct pipe_resource *src, uint64_t dst_offset, uint64_t src_offset, unsigned size); @@ -212,8 +212,8 @@ boolean si_is_format_supported(struct pipe_screen *screen, int si_shader_select(struct pipe_context *ctx, struct si_pipe_shader_selector *sel, unsigned *dirty); -void si_init_state_functions(struct r600_context *rctx); -void si_init_config(struct r600_context *rctx); +void si_init_state_functions(struct si_context *rctx); +void si_init_config(struct si_context *rctx); /* si_state_draw.c */ extern const struct r600_atom si_atom_cache_flush; -- cgit v1.2.3