From 238aeabce0e5cfd850279a68fe0c816adc175294 Mon Sep 17 00:00:00 2001 From: Andreas Hartmetz Date: Sat, 11 Jan 2014 15:47:07 +0100 Subject: [PATCH] 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.h | 30 +++---- src/gallium/drivers/radeonsi/si_blit.c | 34 +++---- src/gallium/drivers/radeonsi/si_buffer.c | 4 +- src/gallium/drivers/radeonsi/si_compute.c | 12 +-- src/gallium/drivers/radeonsi/si_descriptors.c | 44 ++++----- src/gallium/drivers/radeonsi/si_hw_context.c | 34 +++---- src/gallium/drivers/radeonsi/si_pipe.c | 20 ++--- src/gallium/drivers/radeonsi/si_pipe.h | 32 +++---- src/gallium/drivers/radeonsi/si_pm4.c | 14 +-- src/gallium/drivers/radeonsi/si_pm4.h | 16 ++-- src/gallium/drivers/radeonsi/si_query.c | 14 +-- src/gallium/drivers/radeonsi/si_resource.c | 2 +- src/gallium/drivers/radeonsi/si_resource.h | 4 +- src/gallium/drivers/radeonsi/si_shader.c | 4 +- src/gallium/drivers/radeonsi/si_shader.h | 2 +- src/gallium/drivers/radeonsi/si_state.c | 90 +++++++++---------- src/gallium/drivers/radeonsi/si_state.h | 14 +-- src/gallium/drivers/radeonsi/si_state_draw.c | 16 ++-- src/gallium/drivers/radeonsi/si_translate.c | 2 +- src/gallium/drivers/radeonsi/si_uvd.c | 2 +- 20 files changed, 195 insertions(+), 195 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si.h b/src/gallium/drivers/radeonsi/si.h index d955ae9f7de..466d52e3d5e 100644 --- a/src/gallium/drivers/radeonsi/si.h +++ b/src/gallium/drivers/radeonsi/si.h @@ -60,29 +60,29 @@ struct r600_query { struct list_head list; }; -struct r600_context; -struct r600_screen; +struct si_context; +struct si_screen; -void si_get_backend_mask(struct r600_context *ctx); -void si_context_flush(struct r600_context *ctx, unsigned flags); -void si_begin_new_cs(struct r600_context *ctx); +void si_get_backend_mask(struct si_context *ctx); +void si_context_flush(struct si_context *ctx, unsigned flags); +void si_begin_new_cs(struct si_context *ctx); -struct r600_query *r600_context_query_create(struct r600_context *ctx, unsigned query_type); -void r600_context_query_destroy(struct r600_context *ctx, struct r600_query *query); -boolean r600_context_query_result(struct r600_context *ctx, +struct r600_query *r600_context_query_create(struct si_context *ctx, unsigned query_type); +void r600_context_query_destroy(struct si_context *ctx, struct r600_query *query); +boolean r600_context_query_result(struct si_context *ctx, struct r600_query *query, boolean wait, void *vresult); -void r600_query_begin(struct r600_context *ctx, struct r600_query *query); -void r600_query_end(struct r600_context *ctx, struct r600_query *query); -void r600_context_queries_suspend(struct r600_context *ctx); -void r600_context_queries_resume(struct r600_context *ctx); -void r600_query_predication(struct r600_context *ctx, struct r600_query *query, int operation, +void r600_query_begin(struct si_context *ctx, struct r600_query *query); +void r600_query_end(struct si_context *ctx, struct r600_query *query); +void r600_context_queries_suspend(struct si_context *ctx); +void r600_context_queries_resume(struct si_context *ctx); +void r600_query_predication(struct si_context *ctx, struct r600_query *query, int operation, int flag_wait); bool si_is_timer_query(unsigned type); bool si_query_needs_begin(unsigned type); -void si_need_cs_space(struct r600_context *ctx, unsigned num_dw, boolean count_draw_in); +void si_need_cs_space(struct si_context *ctx, unsigned num_dw, boolean count_draw_in); -int si_context_init(struct r600_context *ctx); +int si_context_init(struct si_context *ctx); #endif diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 589d8f55638..5c2ba3d96b2 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -49,7 +49,7 @@ enum r600_blitter_op /* bitmask */ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; r600_context_queries_suspend(rctx); @@ -92,7 +92,7 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op static void r600_blitter_end(struct pipe_context *ctx) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; if (rctx->saved_render_cond) { rctx->b.b.render_condition(&rctx->b.b, rctx->saved_render_cond, @@ -115,7 +115,7 @@ static void r600_blit_decompress_depth(struct pipe_context *ctx, unsigned first_layer, unsigned last_layer, unsigned first_sample, unsigned last_sample) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; unsigned layer, level, sample, checked_last_layer, max_layer, max_sample; float depth = 1.0f; const struct util_format_description *desc; @@ -188,7 +188,7 @@ static void r600_blit_decompress_depth(struct pipe_context *ctx, } } -static void si_blit_decompress_depth_in_place(struct r600_context *rctx, +static void si_blit_decompress_depth_in_place(struct si_context *rctx, struct r600_texture *texture, unsigned first_level, unsigned last_level, unsigned first_layer, unsigned last_layer) @@ -232,8 +232,8 @@ static void si_blit_decompress_depth_in_place(struct r600_context *rctx, } } -void si_flush_depth_textures(struct r600_context *rctx, - struct r600_textures_info *textures) +void si_flush_depth_textures(struct si_context *rctx, + struct si_textures_info *textures) { unsigned i; @@ -259,7 +259,7 @@ static void r600_blit_decompress_color(struct pipe_context *ctx, unsigned first_level, unsigned last_level, unsigned first_layer, unsigned last_layer) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; unsigned layer, level, checked_last_layer, max_layer; if (!rtex->dirty_level_mask) @@ -299,8 +299,8 @@ static void r600_blit_decompress_color(struct pipe_context *ctx, } } -void r600_decompress_color_textures(struct r600_context *rctx, - struct r600_textures_info *textures) +void r600_decompress_color_textures(struct si_context *rctx, + struct si_textures_info *textures) { unsigned i; unsigned mask = textures->compressed_colortex_mask; @@ -327,7 +327,7 @@ static void r600_clear(struct pipe_context *ctx, unsigned buffers, const union pipe_color_union *color, double depth, unsigned stencil) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct pipe_framebuffer_state *fb = &rctx->framebuffer; r600_blitter_begin(ctx, R600_CLEAR); @@ -343,7 +343,7 @@ static void r600_clear_render_target(struct pipe_context *ctx, unsigned dstx, unsigned dsty, unsigned width, unsigned height) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; r600_blitter_begin(ctx, R600_CLEAR_SURFACE); util_blitter_clear_render_target(rctx->blitter, dst, color, @@ -359,7 +359,7 @@ static void r600_clear_depth_stencil(struct pipe_context *ctx, unsigned dstx, unsigned dsty, unsigned width, unsigned height) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; r600_blitter_begin(ctx, R600_CLEAR_SURFACE); util_blitter_clear_depth_stencil(rctx->blitter, dst, clear_flags, depth, stencil, @@ -376,7 +376,7 @@ static void r600_decompress_subresource(struct pipe_context *ctx, unsigned level, unsigned first_layer, unsigned last_layer) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct r600_texture *rtex = (struct r600_texture*)tex; if (rtex->is_depth && !rtex->is_flushing_texture) { @@ -490,7 +490,7 @@ static void r600_resource_copy_region(struct pipe_context *ctx, unsigned src_level, const struct pipe_box *src_box) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct texture_orig_info orig_info[2]; struct pipe_box sbox; const struct pipe_box *psbox = src_box; @@ -622,7 +622,7 @@ static enum pipe_format int_to_norm_format(enum pipe_format format) static bool do_hardware_msaa_resolve(struct pipe_context *ctx, const struct pipe_blit_info *info) { - struct r600_context *rctx = (struct r600_context*)ctx; + struct si_context *rctx = (struct si_context*)ctx; struct r600_texture *dst = (struct r600_texture*)info->dst.resource; unsigned dst_width = u_minify(info->dst.resource->width0, info->dst.level); unsigned dst_height = u_minify(info->dst.resource->height0, info->dst.level); @@ -668,7 +668,7 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx, static void si_blit(struct pipe_context *ctx, const struct pipe_blit_info *info) { - struct r600_context *rctx = (struct r600_context*)ctx; + struct si_context *rctx = (struct si_context*)ctx; if (do_hardware_msaa_resolve(ctx, info)) { return; @@ -692,7 +692,7 @@ static void si_flush_resource(struct pipe_context *ctx, { } -void si_init_blit_functions(struct r600_context *rctx) +void si_init_blit_functions(struct si_context *rctx) { rctx->b.b.clear = r600_clear; rctx->b.b.clear_render_target = r600_clear_render_target; diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c index ca77f2ba356..eb7f87b0aea 100644 --- a/src/gallium/drivers/radeonsi/si_buffer.c +++ b/src/gallium/drivers/radeonsi/si_buffer.c @@ -35,14 +35,14 @@ #include "si.h" #include "si_pipe.h" -void r600_upload_index_buffer(struct r600_context *rctx, +void r600_upload_index_buffer(struct si_context *rctx, struct pipe_index_buffer *ib, unsigned count) { u_upload_data(rctx->b.uploader, 0, count * ib->index_size, ib->user_buffer, &ib->offset, &ib->buffer); } -void r600_upload_const_buffer(struct r600_context *rctx, struct r600_resource **rbuffer, +void r600_upload_const_buffer(struct si_context *rctx, struct r600_resource **rbuffer, const uint8_t *ptr, unsigned size, uint32_t *const_offset) { diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 40d75daa3f5..b53b1f65211 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -9,7 +9,7 @@ #define MAX_GLOBAL_BUFFERS 20 struct si_pipe_compute { - struct r600_context *ctx; + struct si_context *ctx; unsigned local_size; unsigned private_size; @@ -27,7 +27,7 @@ static void *radeonsi_create_compute_state( struct pipe_context *ctx, const struct pipe_compute_state *cso) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pipe_compute *program = CALLOC_STRUCT(si_pipe_compute); const struct pipe_llvm_program_header *header; @@ -60,7 +60,7 @@ static void *radeonsi_create_compute_state( static void radeonsi_bind_compute_state(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context*)ctx; + struct si_context *rctx = (struct si_context*)ctx; rctx->cs_shader_state.program = (struct si_pipe_compute*)state; } @@ -70,7 +70,7 @@ static void radeonsi_set_global_binding( uint32_t **handles) { unsigned i; - struct r600_context *rctx = (struct r600_context*)ctx; + struct si_context *rctx = (struct si_context*)ctx; struct si_pipe_compute *program = rctx->cs_shader_state.program; if (!resources) { @@ -93,7 +93,7 @@ static void radeonsi_launch_grid( const uint *block_layout, const uint *grid_layout, uint32_t pc, const void *input) { - struct r600_context *rctx = (struct r600_context*)ctx; + struct si_context *rctx = (struct si_context*)ctx; struct si_pipe_compute *program = rctx->cs_shader_state.program; struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state); struct r600_resource *kernel_args_buffer = NULL; @@ -287,7 +287,7 @@ static void si_set_compute_resources(struct pipe_context * ctx_, unsigned start, unsigned count, struct pipe_surface ** surfaces) { } -void si_init_compute_functions(struct r600_context *rctx) +void si_init_compute_functions(struct si_context *rctx) { rctx->b.b.create_compute_state = radeonsi_create_compute_state; rctx->b.b.delete_compute_state = si_delete_compute_state; diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 9cb5da12ad8..daf80e30f1b 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -46,7 +46,7 @@ static uint32_t null_desc[8]; /* zeros */ /* Emit a CP DMA packet to do a copy from one buffer to another. * The size must fit in bits [20:0]. */ -static void si_emit_cp_dma_copy_buffer(struct r600_context *rctx, +static void si_emit_cp_dma_copy_buffer(struct si_context *rctx, uint64_t dst_va, uint64_t src_va, unsigned size, unsigned flags) { @@ -76,7 +76,7 @@ static void si_emit_cp_dma_copy_buffer(struct r600_context *rctx, } /* Emit a CP DMA packet to clear a buffer. The size must fit in bits [20:0]. */ -static void si_emit_cp_dma_clear_buffer(struct r600_context *rctx, +static void si_emit_cp_dma_clear_buffer(struct si_context *rctx, uint64_t dst_va, unsigned size, uint32_t clear_value, unsigned flags) { @@ -105,12 +105,12 @@ static void si_emit_cp_dma_clear_buffer(struct r600_context *rctx, } } -static void si_init_descriptors(struct r600_context *rctx, +static void si_init_descriptors(struct si_context *rctx, struct si_descriptors *desc, unsigned shader_userdata_reg, unsigned element_dw_size, unsigned num_elements, - void (*emit_func)(struct r600_context *ctx, struct r600_atom *state)) + void (*emit_func)(struct si_context *ctx, struct r600_atom *state)) { uint64_t va; @@ -142,7 +142,7 @@ static void si_release_descriptors(struct si_descriptors *desc) pipe_resource_reference((struct pipe_resource**)&desc->buffer, NULL); } -static void si_update_descriptors(struct r600_context *rctx, +static void si_update_descriptors(struct si_context *rctx, struct si_descriptors *desc) { if (desc->dirty_mask) { @@ -158,7 +158,7 @@ static void si_update_descriptors(struct r600_context *rctx, } } -static void si_emit_shader_pointer(struct r600_context *rctx, +static void si_emit_shader_pointer(struct si_context *rctx, struct si_descriptors *desc) { struct radeon_winsys_cs *cs = rctx->b.rings.gfx.cs; @@ -171,7 +171,7 @@ static void si_emit_shader_pointer(struct r600_context *rctx, radeon_emit(cs, va >> 32); } -static void si_emit_descriptors(struct r600_context *rctx, +static void si_emit_descriptors(struct si_context *rctx, struct si_descriptors *desc, uint32_t **descriptors) { @@ -255,14 +255,14 @@ static unsigned si_get_shader_user_data_base(unsigned shader) /* SAMPLER VIEWS */ -static void si_emit_sampler_views(struct r600_context *rctx, struct r600_atom *atom) +static void si_emit_sampler_views(struct si_context *rctx, struct r600_atom *atom) { struct si_sampler_views *views = (struct si_sampler_views*)atom; si_emit_descriptors(rctx, &views->desc, views->desc_data); } -static void si_init_sampler_views(struct r600_context *rctx, +static void si_init_sampler_views(struct si_context *rctx, struct si_sampler_views *views, unsigned shader) { @@ -282,7 +282,7 @@ static void si_release_sampler_views(struct si_sampler_views *views) si_release_descriptors(&views->desc); } -static void si_sampler_views_begin_new_cs(struct r600_context *rctx, +static void si_sampler_views_begin_new_cs(struct si_context *rctx, struct si_sampler_views *views) { unsigned mask = views->desc.enabled_mask; @@ -301,7 +301,7 @@ static void si_sampler_views_begin_new_cs(struct r600_context *rctx, si_emit_shader_pointer(rctx, &views->desc); } -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) { @@ -331,14 +331,14 @@ void si_set_sampler_view(struct r600_context *rctx, unsigned shader, /* BUFFER RESOURCES */ -static void si_emit_buffer_resources(struct r600_context *rctx, struct r600_atom *atom) +static void si_emit_buffer_resources(struct si_context *rctx, struct r600_atom *atom) { struct si_buffer_resources *buffers = (struct si_buffer_resources*)atom; si_emit_descriptors(rctx, &buffers->desc, buffers->desc_data); } -static void si_init_buffer_resources(struct r600_context *rctx, +static void si_init_buffer_resources(struct si_context *rctx, struct si_buffer_resources *buffers, unsigned num_buffers, unsigned shader, unsigned shader_userdata_index, @@ -378,7 +378,7 @@ static void si_release_buffer_resources(struct si_buffer_resources *buffers) si_release_descriptors(&buffers->desc); } -static void si_buffer_resources_begin_new_cs(struct r600_context *rctx, +static void si_buffer_resources_begin_new_cs(struct si_context *rctx, struct si_buffer_resources *buffers) { unsigned mask = buffers->desc.enabled_mask; @@ -403,7 +403,7 @@ static void si_buffer_resources_begin_new_cs(struct r600_context *rctx, static void si_set_constant_buffer(struct pipe_context *ctx, uint shader, uint slot, struct pipe_constant_buffer *input) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_buffer_resources *buffers = &rctx->const_buffers[shader]; if (shader >= SI_NUM_SHADERS) @@ -469,7 +469,7 @@ static void si_set_streamout_targets(struct pipe_context *ctx, struct pipe_stream_output_target **targets, unsigned append_bitmask) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_buffer_resources *buffers = &rctx->streamout_buffers; unsigned old_num_targets = rctx->b.streamout.num_targets; unsigned i; @@ -553,7 +553,7 @@ static void si_desc_reset_buffer_offset(struct pipe_context *ctx, */ static void si_invalidate_buffer(struct pipe_context *ctx, struct pipe_resource *buf) { - struct r600_context *rctx = (struct r600_context*)ctx; + struct si_context *rctx = (struct si_context*)ctx; struct r600_resource *rbuffer = r600_resource(buf); unsigned i, shader, alignment = rbuffer->buf->alignment; uint64_t old_va = r600_resource_va(ctx->screen, buf); @@ -654,7 +654,7 @@ static void si_invalidate_buffer(struct pipe_context *ctx, struct pipe_resource static void si_clear_buffer(struct pipe_context *ctx, struct pipe_resource *dst, unsigned offset, unsigned size, unsigned value) { - struct r600_context *rctx = (struct r600_context*)ctx; + struct si_context *rctx = (struct si_context*)ctx; if (!size) return; @@ -728,7 +728,7 @@ static void si_clear_buffer(struct pipe_context *ctx, struct pipe_resource *dst, R600_CONTEXT_FLUSH_AND_INV_DB_META; } -void si_copy_buffer(struct r600_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) { @@ -791,7 +791,7 @@ void si_copy_buffer(struct r600_context *rctx, /* INIT/DEINIT */ -void si_init_all_descriptors(struct r600_context *rctx) +void si_init_all_descriptors(struct si_context *rctx) { int i; @@ -817,7 +817,7 @@ void si_init_all_descriptors(struct r600_context *rctx) rctx->b.invalidate_buffer = si_invalidate_buffer; } -void si_release_all_descriptors(struct r600_context *rctx) +void si_release_all_descriptors(struct si_context *rctx) { int i; @@ -828,7 +828,7 @@ void si_release_all_descriptors(struct r600_context *rctx) si_release_buffer_resources(&rctx->streamout_buffers); } -void si_all_descriptors_begin_new_cs(struct r600_context *rctx) +void si_all_descriptors_begin_new_cs(struct si_context *rctx) { int i; diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c index bb67baa52d2..d5637810f9e 100644 --- a/src/gallium/drivers/radeonsi/si_hw_context.c +++ b/src/gallium/drivers/radeonsi/si_hw_context.c @@ -33,7 +33,7 @@ #define GROUP_FORCE_NEW_BLOCK 0 /* Get backends mask */ -void si_get_backend_mask(struct r600_context *ctx) +void si_get_backend_mask(struct si_context *ctx) { struct radeon_winsys_cs *cs = ctx->b.rings.gfx.cs; struct r600_resource *buffer; @@ -123,7 +123,7 @@ bool si_query_needs_begin(unsigned type) } /* initialize */ -void si_need_cs_space(struct r600_context *ctx, unsigned num_dw, +void si_need_cs_space(struct si_context *ctx, unsigned num_dw, boolean count_draw_in) { int i; @@ -173,7 +173,7 @@ void si_need_cs_space(struct r600_context *ctx, unsigned num_dw, } } -void si_context_flush(struct r600_context *ctx, unsigned flags) +void si_context_flush(struct si_context *ctx, unsigned flags) { struct radeon_winsys_cs *cs = ctx->b.rings.gfx.cs; @@ -210,7 +210,7 @@ void si_context_flush(struct r600_context *ctx, unsigned flags) #if R600_TRACE_CS if (ctx->screen->trace_bo) { - struct r600_screen *rscreen = ctx->screen; + struct si_screen *rscreen = ctx->screen; unsigned i; for (i = 0; i < cs->cdw; i++) { @@ -225,7 +225,7 @@ void si_context_flush(struct r600_context *ctx, unsigned flags) #if R600_TRACE_CS if (ctx->screen->trace_bo) { - struct r600_screen *rscreen = ctx->screen; + struct si_screen *rscreen = ctx->screen; unsigned i; for (i = 0; i < 10; i++) { @@ -246,7 +246,7 @@ void si_context_flush(struct r600_context *ctx, unsigned flags) si_begin_new_cs(ctx); } -void si_begin_new_cs(struct r600_context *ctx) +void si_begin_new_cs(struct si_context *ctx) { ctx->pm4_dirty_cdwords = 0; @@ -295,7 +295,7 @@ static unsigned r600_query_read_result(char *map, unsigned start_index, unsigned return 0; } -static boolean r600_query_result(struct r600_context *ctx, struct r600_query *query, boolean wait) +static boolean r600_query_result(struct si_context *ctx, struct r600_query *query, boolean wait) { unsigned results_base = query->results_start; char *map; @@ -382,7 +382,7 @@ static boolean r600_query_result(struct r600_context *ctx, struct r600_query *qu return TRUE; } -void r600_query_begin(struct r600_context *ctx, struct r600_query *query) +void r600_query_begin(struct si_context *ctx, struct r600_query *query) { struct radeon_winsys_cs *cs = ctx->b.rings.gfx.cs; unsigned new_results_end, i; @@ -471,7 +471,7 @@ void r600_query_begin(struct r600_context *ctx, struct r600_query *query) } } -void r600_query_end(struct r600_context *ctx, struct r600_query *query) +void r600_query_end(struct si_context *ctx, struct r600_query *query) { struct radeon_winsys_cs *cs = ctx->b.rings.gfx.cs; uint64_t va; @@ -534,7 +534,7 @@ void r600_query_end(struct r600_context *ctx, struct r600_query *query) } } -void r600_query_predication(struct r600_context *ctx, struct r600_query *query, int operation, +void r600_query_predication(struct si_context *ctx, struct r600_query *query, int operation, int flag_wait) { struct radeon_winsys_cs *cs = ctx->b.rings.gfx.cs; @@ -577,7 +577,7 @@ void r600_query_predication(struct r600_context *ctx, struct r600_query *query, } } -struct r600_query *r600_context_query_create(struct r600_context *ctx, unsigned query_type) +struct r600_query *r600_context_query_create(struct si_context *ctx, unsigned query_type) { struct r600_query *query; unsigned buffer_size = 4096; @@ -633,13 +633,13 @@ struct r600_query *r600_context_query_create(struct r600_context *ctx, unsigned return query; } -void r600_context_query_destroy(struct r600_context *ctx, struct r600_query *query) +void r600_context_query_destroy(struct si_context *ctx, struct r600_query *query) { r600_resource_reference(&query->buffer, NULL); free(query); } -boolean r600_context_query_result(struct r600_context *ctx, +boolean r600_context_query_result(struct si_context *ctx, struct r600_query *query, boolean wait, void *vresult) { @@ -674,7 +674,7 @@ boolean r600_context_query_result(struct r600_context *ctx, return TRUE; } -void r600_context_queries_suspend(struct r600_context *ctx) +void r600_context_queries_suspend(struct si_context *ctx) { struct r600_query *query; @@ -684,7 +684,7 @@ void r600_context_queries_suspend(struct r600_context *ctx) assert(ctx->num_cs_dw_nontimer_queries_suspend == 0); } -void r600_context_queries_resume(struct r600_context *ctx) +void r600_context_queries_resume(struct si_context *ctx) { struct r600_query *query; @@ -696,9 +696,9 @@ void r600_context_queries_resume(struct r600_context *ctx) } #if R600_TRACE_CS -void r600_trace_emit(struct r600_context *rctx) +void r600_trace_emit(struct si_context *rctx) { - struct r600_screen *rscreen = rctx->screen; + struct si_screen *rscreen = rctx->screen; struct radeon_winsys_cs *cs = rctx->cs; uint64_t va; diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 62fd2a3f7a1..67c20b78aaa 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -57,7 +57,7 @@ void radeonsi_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence, unsigned flags) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct pipe_query *render_cond = NULL; boolean render_cond_cond = FALSE; unsigned render_cond_mode = 0; @@ -97,7 +97,7 @@ static void r600_flush_from_winsys(void *ctx, unsigned flags) static void r600_destroy_context(struct pipe_context *context) { - struct r600_context *rctx = (struct r600_context *)context; + struct si_context *rctx = (struct si_context *)context; si_release_all_descriptors(rctx); @@ -125,8 +125,8 @@ static void r600_destroy_context(struct pipe_context *context) static struct pipe_context *r600_create_context(struct pipe_screen *screen, void *priv) { - struct r600_context *rctx = CALLOC_STRUCT(r600_context); - struct r600_screen* rscreen = (struct r600_screen *)screen; + struct si_context *rctx = CALLOC_STRUCT(si_context); + struct si_screen* rscreen = (struct si_screen *)screen; int shader, i; if (rctx == NULL) @@ -267,14 +267,14 @@ static const char *r600_get_family_name(enum radeon_family family) static const char* r600_get_name(struct pipe_screen* pscreen) { - struct r600_screen *rscreen = (struct r600_screen *)pscreen; + struct si_screen *rscreen = (struct si_screen *)pscreen; return r600_get_family_name(rscreen->b.family); } static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) { - struct r600_screen *rscreen = (struct r600_screen *)pscreen; + struct si_screen *rscreen = (struct si_screen *)pscreen; switch (param) { /* Supported features (boolean caps). */ @@ -510,7 +510,7 @@ static int r600_get_compute_param(struct pipe_screen *screen, enum pipe_compute_cap param, void *ret) { - struct r600_screen *rscreen = (struct r600_screen *)screen; + struct si_screen *rscreen = (struct si_screen *)screen; //TODO: select these params by asic switch (param) { case PIPE_COMPUTE_CAP_IR_TARGET: { @@ -587,7 +587,7 @@ static int r600_get_compute_param(struct pipe_screen *screen, static void r600_destroy_screen(struct pipe_screen* pscreen) { - struct r600_screen *rscreen = (struct r600_screen *)pscreen; + struct si_screen *rscreen = (struct si_screen *)pscreen; if (rscreen == NULL) return; @@ -610,7 +610,7 @@ static void r600_destroy_screen(struct pipe_screen* pscreen) static uint64_t r600_get_timestamp(struct pipe_screen *screen) { - struct r600_screen *rscreen = (struct r600_screen*)screen; + struct si_screen *rscreen = (struct si_screen*)screen; return 1000000 * rscreen->b.ws->query_value(rscreen->b.ws, RADEON_TIMESTAMP) / rscreen->b.info.r600_clock_crystal_freq; @@ -618,7 +618,7 @@ static uint64_t r600_get_timestamp(struct pipe_screen *screen) struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws) { - struct r600_screen *rscreen = CALLOC_STRUCT(r600_screen); + struct si_screen *rscreen = CALLOC_STRUCT(si_screen); if (rscreen == NULL) { return NULL; } diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 36fb875f88f..e55bca0b051 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -53,7 +53,7 @@ struct si_pipe_compute; -struct r600_screen { +struct si_screen { struct r600_common_screen b; #if R600_TRACE_CS struct r600_resource *trace_bo; @@ -78,7 +78,7 @@ struct si_cs_shader_state { struct si_pipe_compute *program; }; -struct r600_textures_info { +struct si_textures_info { struct si_sampler_views views; struct si_pipe_sampler_state *samplers[NUM_TEX_UNITS]; unsigned n_views; @@ -90,7 +90,7 @@ struct r600_textures_info { #define SI_NUM_ATOMS(rctx) (sizeof((rctx)->atoms)/sizeof((rctx)->atoms.array[0])) #define SI_NUM_SHADERS (PIPE_SHADER_FRAGMENT+1) -struct r600_context { +struct si_context { struct r600_common_context b; struct blitter_context *blitter; void *custom_dsa_flush_depth_stencil[8]; @@ -99,7 +99,7 @@ struct r600_context { void *custom_dsa_flush_inplace; void *custom_blend_resolve; void *custom_blend_decompress; - struct r600_screen *screen; + struct si_screen *screen; union { struct { @@ -138,7 +138,7 @@ struct r600_context { unsigned export_16bpc; struct si_buffer_resources const_buffers[SI_NUM_SHADERS]; struct si_buffer_resources streamout_buffers; - struct r600_textures_info samplers[SI_NUM_SHADERS]; + struct si_textures_info samplers[SI_NUM_SHADERS]; struct r600_resource *border_color_table; unsigned border_color_offset; @@ -176,14 +176,14 @@ struct r600_context { }; /* si_blit.c */ -void si_init_blit_functions(struct r600_context *rctx); -void si_flush_depth_textures(struct r600_context *rctx, - struct r600_textures_info *textures); -void r600_decompress_color_textures(struct r600_context *rctx, - struct r600_textures_info *textures); +void si_init_blit_functions(struct si_context *rctx); +void si_flush_depth_textures(struct si_context *rctx, + struct si_textures_info *textures); +void r600_decompress_color_textures(struct si_context *rctx, + struct si_textures_info *textures); /* si_buffer.c */ -void r600_upload_index_buffer(struct r600_context *rctx, +void r600_upload_index_buffer(struct si_context *rctx, struct pipe_index_buffer *ib, unsigned count); @@ -193,22 +193,22 @@ void radeonsi_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence, const char *r600_get_llvm_processor_name(enum radeon_family family); /* si_query.c */ -void r600_init_query_functions(struct r600_context *rctx); +void r600_init_query_functions(struct si_context *rctx); /* si_resource.c */ -void r600_init_context_resource_functions(struct r600_context *r600); +void r600_init_context_resource_functions(struct si_context *r600); /* si_translate.c */ -void r600_translate_index_buffer(struct r600_context *r600, +void r600_translate_index_buffer(struct si_context *r600, struct pipe_index_buffer *ib, unsigned count); #if R600_TRACE_CS -void r600_trace_emit(struct r600_context *rctx); +void r600_trace_emit(struct si_context *rctx); #endif /* si_compute.c */ -void si_init_compute_functions(struct r600_context *rctx); +void si_init_compute_functions(struct si_context *rctx); /* si_uvd.c */ struct pipe_video_codec *radeonsi_uvd_create_decoder(struct pipe_context *context, diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c index 511c32d8866..c08c86475c6 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.c +++ b/src/gallium/drivers/radeonsi/si_pm4.c @@ -145,7 +145,7 @@ void si_pm4_inval_texture_cache(struct si_pm4_state *state) state->cp_coher_cntl |= S_0085F0_TCL1_ACTION_ENA(1); } -void si_pm4_free_state(struct r600_context *rctx, +void si_pm4_free_state(struct si_context *rctx, struct si_pm4_state *state, unsigned idx) { @@ -162,7 +162,7 @@ void si_pm4_free_state(struct r600_context *rctx, FREE(state); } -struct si_pm4_state * si_pm4_alloc_state(struct r600_context *rctx) +struct si_pm4_state * si_pm4_alloc_state(struct si_context *rctx) { struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state); @@ -174,7 +174,7 @@ struct si_pm4_state * si_pm4_alloc_state(struct r600_context *rctx) return pm4; } -uint32_t si_pm4_sync_flags(struct r600_context *rctx) +uint32_t si_pm4_sync_flags(struct si_context *rctx) { uint32_t cp_coher_cntl = 0; @@ -189,7 +189,7 @@ uint32_t si_pm4_sync_flags(struct r600_context *rctx) return cp_coher_cntl; } -unsigned si_pm4_dirty_dw(struct r600_context *rctx) +unsigned si_pm4_dirty_dw(struct si_context *rctx) { unsigned count = 0; @@ -211,7 +211,7 @@ unsigned si_pm4_dirty_dw(struct r600_context *rctx) return count; } -void si_pm4_emit(struct r600_context *rctx, struct si_pm4_state *state) +void si_pm4_emit(struct si_context *rctx, struct si_pm4_state *state) { struct radeon_winsys_cs *cs = rctx->b.rings.gfx.cs; for (int i = 0; i < state->nbo; ++i) { @@ -234,7 +234,7 @@ void si_pm4_emit(struct r600_context *rctx, struct si_pm4_state *state) #endif } -void si_pm4_emit_dirty(struct r600_context *rctx) +void si_pm4_emit_dirty(struct si_context *rctx) { for (int i = 0; i < NUMBER_OF_STATES; ++i) { struct si_pm4_state *state = rctx->queued.array[i]; @@ -248,7 +248,7 @@ void si_pm4_emit_dirty(struct r600_context *rctx) } } -void si_pm4_reset_emitted(struct r600_context *rctx) +void si_pm4_reset_emitted(struct si_context *rctx) { memset(&rctx->emitted, 0, sizeof(rctx->emitted)); } diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h index fcdf470e6cf..a22f5d1c705 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.h +++ b/src/gallium/drivers/radeonsi/si_pm4.h @@ -34,7 +34,7 @@ #define SI_PM4_MAX_RELOCS 4 // forward defines -struct r600_context; +struct si_context; enum chip_class; struct si_pm4_state @@ -81,15 +81,15 @@ void si_pm4_sh_data_end(struct si_pm4_state *state, unsigned base, unsigned idx) void si_pm4_inval_shader_cache(struct si_pm4_state *state); void si_pm4_inval_texture_cache(struct si_pm4_state *state); -void si_pm4_free_state(struct r600_context *rctx, +void si_pm4_free_state(struct si_context *rctx, struct si_pm4_state *state, unsigned idx); -struct si_pm4_state * si_pm4_alloc_state(struct r600_context *rctx); +struct si_pm4_state * si_pm4_alloc_state(struct si_context *rctx); -uint32_t si_pm4_sync_flags(struct r600_context *rctx); -unsigned si_pm4_dirty_dw(struct r600_context *rctx); -void si_pm4_emit(struct r600_context *rctx, struct si_pm4_state *state); -void si_pm4_emit_dirty(struct r600_context *rctx); -void si_pm4_reset_emitted(struct r600_context *rctx); +uint32_t si_pm4_sync_flags(struct si_context *rctx); +unsigned si_pm4_dirty_dw(struct si_context *rctx); +void si_pm4_emit(struct si_context *rctx, struct si_pm4_state *state); +void si_pm4_emit_dirty(struct si_context *rctx); +void si_pm4_reset_emitted(struct si_context *rctx); #endif diff --git a/src/gallium/drivers/radeonsi/si_query.c b/src/gallium/drivers/radeonsi/si_query.c index 2f23d0881de..dd6aff6ef9f 100644 --- a/src/gallium/drivers/radeonsi/si_query.c +++ b/src/gallium/drivers/radeonsi/si_query.c @@ -25,21 +25,21 @@ static struct pipe_query *r600_create_query(struct pipe_context *ctx, unsigned query_type) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; return (struct pipe_query*)r600_context_query_create(rctx, query_type); } static void r600_destroy_query(struct pipe_context *ctx, struct pipe_query *query) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; r600_context_query_destroy(rctx, (struct r600_query *)query); } static void r600_begin_query(struct pipe_context *ctx, struct pipe_query *query) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct r600_query *rquery = (struct r600_query *)query; if (!si_query_needs_begin(rquery->type)) { @@ -58,7 +58,7 @@ static void r600_begin_query(struct pipe_context *ctx, struct pipe_query *query) static void r600_end_query(struct pipe_context *ctx, struct pipe_query *query) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct r600_query *rquery = (struct r600_query *)query; if (!si_query_needs_begin(rquery->type)) { @@ -76,7 +76,7 @@ static boolean r600_get_query_result(struct pipe_context *ctx, struct pipe_query *query, boolean wait, union pipe_query_result *vresult) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct r600_query *rquery = (struct r600_query *)query; return r600_context_query_result(rctx, rquery, wait, vresult); @@ -87,7 +87,7 @@ static void r600_render_condition(struct pipe_context *ctx, boolean condition, uint mode) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct r600_query *rquery = (struct r600_query *)query; int wait_flag = 0; @@ -134,7 +134,7 @@ static void r600_render_condition(struct pipe_context *ctx, } } -void r600_init_query_functions(struct r600_context *rctx) +void r600_init_query_functions(struct si_context *rctx) { rctx->b.b.create_query = r600_create_query; rctx->b.b.destroy_query = r600_destroy_query; diff --git a/src/gallium/drivers/radeonsi/si_resource.c b/src/gallium/drivers/radeonsi/si_resource.c index 1d1e9d8c9b3..46a947d11b5 100644 --- a/src/gallium/drivers/radeonsi/si_resource.c +++ b/src/gallium/drivers/radeonsi/si_resource.c @@ -52,7 +52,7 @@ void r600_init_screen_resource_functions(struct pipe_screen *screen) screen->resource_destroy = u_resource_destroy_vtbl; } -void r600_init_context_resource_functions(struct r600_context *r600) +void r600_init_context_resource_functions(struct si_context *r600) { r600->b.b.transfer_map = u_transfer_map_vtbl; r600->b.b.transfer_flush_region = u_default_transfer_flush_region; diff --git a/src/gallium/drivers/radeonsi/si_resource.h b/src/gallium/drivers/radeonsi/si_resource.h index 5a9aba31125..a5d2ada1bde 100644 --- a/src/gallium/drivers/radeonsi/si_resource.h +++ b/src/gallium/drivers/radeonsi/si_resource.h @@ -46,9 +46,9 @@ struct r600_surface { void r600_init_screen_resource_functions(struct pipe_screen *screen); -struct r600_context; +struct si_context; -void r600_upload_const_buffer(struct r600_context *rctx, struct r600_resource **rbuffer, +void r600_upload_const_buffer(struct si_context *rctx, struct r600_resource **rbuffer, const uint8_t *ptr, unsigned size, uint32_t *const_offset); diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 03a1c83f7e8..a24cf65e5b0 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1889,7 +1889,7 @@ static void preload_streamout_buffers(struct si_shader_context *si_shader_ctx) } } -int si_compile_llvm(struct r600_context *rctx, struct si_pipe_shader *shader, +int si_compile_llvm(struct si_context *rctx, struct si_pipe_shader *shader, LLVMModuleRef mod) { unsigned i; @@ -1967,7 +1967,7 @@ int si_pipe_shader_create( struct pipe_context *ctx, struct si_pipe_shader *shader) { - struct r600_context *rctx = (struct r600_context*)ctx; + struct si_context *rctx = (struct si_context*)ctx; struct si_pipe_shader_selector *sel = shader->selector; struct si_shader_context si_shader_ctx; struct tgsi_shader_info shader_info; diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 2a15a9fa2bd..3106473773d 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -154,7 +154,7 @@ struct si_pipe_shader { /* radeonsi_shader.c */ int si_pipe_shader_create(struct pipe_context *ctx, struct si_pipe_shader *shader); int si_pipe_shader_create(struct pipe_context *ctx, struct si_pipe_shader *shader); -int si_compile_llvm(struct r600_context *rctx, struct si_pipe_shader *shader, +int si_compile_llvm(struct si_context *rctx, struct si_pipe_shader *shader, LLVMModuleRef mod); void si_pipe_shader_destroy(struct pipe_context *ctx, struct si_pipe_shader *shader); diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 10d016730d3..6ebbd91a05a 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -40,7 +40,7 @@ #include "../radeon/r600_cs.h" #include "sid.h" -static uint32_t cik_num_banks(struct r600_screen *rscreen, unsigned bpe, unsigned tile_split) +static uint32_t cik_num_banks(struct si_screen *rscreen, unsigned bpe, unsigned tile_split) { if (rscreen->b.info.cik_macrotile_mode_array_valid) { unsigned index, tileb; @@ -140,7 +140,7 @@ static unsigned cik_bank_wh(unsigned bankwh) return bankwh; } -static unsigned cik_db_pipe_config(struct r600_screen *rscreen, unsigned tile_mode) +static unsigned cik_db_pipe_config(struct si_screen *rscreen, unsigned tile_mode) { if (rscreen->b.info.si_tile_mode_array_valid) { uint32_t gb_tile_mode = rscreen->b.info.si_tile_mode_array[tile_mode]; @@ -169,7 +169,7 @@ static unsigned cik_db_pipe_config(struct r600_screen *rscreen, unsigned tile_mo /* * inferred framebuffer and blender state */ -static void si_update_fb_blend_state(struct r600_context *rctx) +static void si_update_fb_blend_state(struct si_context *rctx) { struct si_pm4_state *pm4; struct si_state_blend *blend = rctx->queued.named.blend; @@ -344,21 +344,21 @@ static void *si_create_blend_state(struct pipe_context *ctx, static void si_bind_blend_state(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; si_pm4_bind_state(rctx, blend, (struct si_state_blend *)state); si_update_fb_blend_state(rctx); } static void si_delete_blend_state(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; si_pm4_delete_state(rctx, blend, (struct si_state_blend *)state); } static void si_set_blend_color(struct pipe_context *ctx, const struct pipe_blend_color *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx); if (pm4 == NULL) @@ -379,7 +379,7 @@ static void si_set_blend_color(struct pipe_context *ctx, static void si_set_clip_state(struct pipe_context *ctx, const struct pipe_clip_state *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx); struct pipe_constant_buffer cb; @@ -412,7 +412,7 @@ static void si_set_scissor_states(struct pipe_context *ctx, unsigned num_scissors, const struct pipe_scissor_state *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx); uint32_t tl, br; @@ -438,7 +438,7 @@ static void si_set_viewport_states(struct pipe_context *ctx, unsigned num_viewports, const struct pipe_viewport_state *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_state_viewport *viewport = CALLOC_STRUCT(si_state_viewport); struct si_pm4_state *pm4 = &viewport->pm4; @@ -459,7 +459,7 @@ static void si_set_viewport_states(struct pipe_context *ctx, /* * inferred state between framebuffer and rasterizer */ -static void si_update_fb_rs_state(struct r600_context *rctx) +static void si_update_fb_rs_state(struct si_context *rctx) { struct si_state_rasterizer *rs = rctx->queued.named.rasterizer; struct si_pm4_state *pm4; @@ -631,7 +631,7 @@ static void *si_create_rs_state(struct pipe_context *ctx, static void si_bind_rs_state(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_state_rasterizer *rs = (struct si_state_rasterizer *)state; if (state == NULL) @@ -648,14 +648,14 @@ static void si_bind_rs_state(struct pipe_context *ctx, void *state) static void si_delete_rs_state(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; si_pm4_delete_state(rctx, rasterizer, (struct si_state_rasterizer *)state); } /* * infeered state between dsa and stencil ref */ -static void si_update_dsa_stencil_ref(struct r600_context *rctx) +static void si_update_dsa_stencil_ref(struct si_context *rctx) { struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx); struct pipe_stencil_ref *ref = &rctx->stencil_ref; @@ -681,7 +681,7 @@ static void si_update_dsa_stencil_ref(struct r600_context *rctx) static void si_set_pipe_stencil_ref(struct pipe_context *ctx, const struct pipe_stencil_ref *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; rctx->stencil_ref = *state; si_update_dsa_stencil_ref(rctx); } @@ -779,7 +779,7 @@ static void *si_create_dsa_state(struct pipe_context *ctx, static void si_bind_dsa_state(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_state_dsa *dsa = state; if (state == NULL) @@ -791,11 +791,11 @@ static void si_bind_dsa_state(struct pipe_context *ctx, void *state) static void si_delete_dsa_state(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; si_pm4_delete_state(rctx, dsa, (struct si_state_dsa *)state); } -static void *si_create_db_flush_dsa(struct r600_context *rctx, bool copy_depth, +static void *si_create_db_flush_dsa(struct si_context *rctx, bool copy_depth, bool copy_stencil, int sample) { struct pipe_depth_stencil_alpha_state dsa; @@ -1062,7 +1062,7 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, const struct util_format_description *desc, int first_non_void) { - struct r600_screen *rscreen = (struct r600_screen*)screen; + struct si_screen *rscreen = (struct si_screen*)screen; bool enable_s3tc = rscreen->b.info.drm_minor >= 31; boolean uniform = TRUE; int i; @@ -1476,7 +1476,7 @@ boolean si_is_format_supported(struct pipe_screen *screen, unsigned sample_count, unsigned usage) { - struct r600_screen *rscreen = (struct r600_screen *)screen; + struct si_screen *rscreen = (struct si_screen *)screen; unsigned retval = 0; if (target >= PIPE_MAX_TEXTURE_TYPES) { @@ -1561,7 +1561,7 @@ static unsigned si_tile_mode_index(struct r600_texture *rtex, unsigned level, bo * framebuffer handling */ -static void si_cb(struct r600_context *rctx, struct si_pm4_state *pm4, +static void si_cb(struct si_context *rctx, struct si_pm4_state *pm4, const struct pipe_framebuffer_state *state, int cb) { struct r600_texture *rtex; @@ -1739,10 +1739,10 @@ static void si_cb(struct r600_context *rctx, struct si_pm4_state *pm4, } } -static void si_db(struct r600_context *rctx, struct si_pm4_state *pm4, +static void si_db(struct si_context *rctx, struct si_pm4_state *pm4, const struct pipe_framebuffer_state *state) { - struct r600_screen *rscreen = rctx->screen; + struct si_screen *rscreen = rctx->screen; struct r600_texture *rtex; struct r600_surface *surf; unsigned level, pitch, slice, format, tile_mode_index, array_mode; @@ -1988,7 +1988,7 @@ static void si_get_sample_position(struct pipe_context *ctx, } } -static void si_set_msaa_state(struct r600_context *rctx, struct si_pm4_state *pm4, int nr_samples) +static void si_set_msaa_state(struct si_context *rctx, struct si_pm4_state *pm4, int nr_samples) { unsigned max_dist = 0; @@ -2079,7 +2079,7 @@ static void si_set_msaa_state(struct r600_context *rctx, struct si_pm4_state *pm static void si_set_framebuffer_state(struct pipe_context *ctx, const struct pipe_framebuffer_state *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx); uint32_t tl, br; int tl_x, tl_y, br_x, br_y, nr_samples, i; @@ -2164,7 +2164,7 @@ static INLINE void si_shader_selector_key(struct pipe_context *ctx, struct si_pipe_shader_selector *sel, union si_shader_key *key) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; memset(key, 0, sizeof(*key)); if (sel->type == PIPE_SHADER_VERTEX) { @@ -2309,7 +2309,7 @@ static void *si_create_vs_state(struct pipe_context *ctx, static void si_bind_vs_shader(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pipe_shader_selector *sel = state; if (rctx->vs_shader == sel) @@ -2326,7 +2326,7 @@ static void si_bind_vs_shader(struct pipe_context *ctx, void *state) static void si_bind_ps_shader(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pipe_shader_selector *sel = state; if (rctx->ps_shader == sel) @@ -2343,7 +2343,7 @@ static void si_bind_ps_shader(struct pipe_context *ctx, void *state) static void si_delete_shader_selector(struct pipe_context *ctx, struct si_pipe_shader_selector *sel) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pipe_shader *p = sel->current, *c; while (p) { @@ -2360,7 +2360,7 @@ static void si_delete_shader_selector(struct pipe_context *ctx, static void si_delete_vs_shader(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pipe_shader_selector *sel = (struct si_pipe_shader_selector *)state; if (rctx->vs_shader == sel) { @@ -2372,7 +2372,7 @@ static void si_delete_vs_shader(struct pipe_context *ctx, void *state) static void si_delete_ps_shader(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pipe_shader_selector *sel = (struct si_pipe_shader_selector *)state; if (rctx->ps_shader == sel) { @@ -2709,8 +2709,8 @@ static void si_set_sampler_views(struct pipe_context *ctx, unsigned count, struct pipe_sampler_view **views) { - struct r600_context *rctx = (struct r600_context *)ctx; - struct r600_textures_info *samplers = &rctx->samplers[shader]; + struct si_context *rctx = (struct si_context *)ctx; + struct si_textures_info *samplers = &rctx->samplers[shader]; struct si_pipe_sampler_view **rviews = (struct si_pipe_sampler_view **)views; int i; @@ -2767,9 +2767,9 @@ static void si_set_sampler_views(struct pipe_context *ctx, rctx->b.flags |= R600_CONTEXT_INV_TEX_CACHE; } -static struct si_pm4_state *si_set_sampler_states(struct r600_context *rctx, unsigned count, +static struct si_pm4_state *si_set_sampler_states(struct si_context *rctx, unsigned count, void **states, - struct r600_textures_info *samplers, + struct si_textures_info *samplers, unsigned user_data_reg) { struct si_pipe_sampler_state **rstates = (struct si_pipe_sampler_state **)states; @@ -2843,7 +2843,7 @@ out: static void si_bind_vs_sampler_states(struct pipe_context *ctx, unsigned count, void **states) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pm4_state *pm4; pm4 = si_set_sampler_states(rctx, count, states, &rctx->samplers[PIPE_SHADER_VERTEX], @@ -2853,7 +2853,7 @@ static void si_bind_vs_sampler_states(struct pipe_context *ctx, unsigned count, static void si_bind_ps_sampler_states(struct pipe_context *ctx, unsigned count, void **states) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pm4_state *pm4; pm4 = si_set_sampler_states(rctx, count, states, &rctx->samplers[PIPE_SHADER_FRAGMENT], @@ -2884,7 +2884,7 @@ static void si_bind_sampler_states(struct pipe_context *ctx, unsigned shader, static void si_set_sample_mask(struct pipe_context *ctx, unsigned sample_mask) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx); uint16_t mask = sample_mask; @@ -2942,7 +2942,7 @@ static void *si_create_vertex_elements(struct pipe_context *ctx, static void si_bind_vertex_elements(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_vertex_element *v = (struct si_vertex_element*)state; rctx->vertex_elements = v; @@ -2950,7 +2950,7 @@ static void si_bind_vertex_elements(struct pipe_context *ctx, void *state) static void si_delete_vertex_element(struct pipe_context *ctx, void *state) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; if (rctx->vertex_elements == state) rctx->vertex_elements = NULL; @@ -2960,7 +2960,7 @@ static void si_delete_vertex_element(struct pipe_context *ctx, void *state) static void si_set_vertex_buffers(struct pipe_context *ctx, unsigned start_slot, unsigned count, const struct pipe_vertex_buffer *buffers) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; util_set_vertex_buffers_count(rctx->vertex_buffer, &rctx->nr_vertex_buffers, buffers, start_slot, count); } @@ -2968,7 +2968,7 @@ static void si_set_vertex_buffers(struct pipe_context *ctx, unsigned start_slot, static void si_set_index_buffer(struct pipe_context *ctx, const struct pipe_index_buffer *ib) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; if (ib) { pipe_resource_reference(&rctx->index_buffer.buffer, ib->buffer); @@ -2988,13 +2988,13 @@ static void si_set_polygon_stipple(struct pipe_context *ctx, static void si_texture_barrier(struct pipe_context *ctx) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; rctx->b.flags |= R600_CONTEXT_INV_TEX_CACHE | R600_CONTEXT_FLUSH_AND_INV_CB; } -static void *si_create_blend_custom(struct r600_context *rctx, unsigned mode) +static void *si_create_blend_custom(struct si_context *rctx, unsigned mode) { struct pipe_blend_state blend; @@ -3051,7 +3051,7 @@ static boolean si_dma_copy(struct pipe_context *ctx, return FALSE; } -void si_init_state_functions(struct r600_context *rctx) +void si_init_state_functions(struct si_context *rctx) { int i; @@ -3117,7 +3117,7 @@ void si_init_state_functions(struct r600_context *rctx) rctx->b.b.draw_vbo = si_draw_vbo; } -void si_init_config(struct r600_context *rctx) +void si_init_config(struct si_context *rctx) { struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx); 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; diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 4d5cd0166de..e9ffedfd4fe 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -40,7 +40,7 @@ static void si_pipe_shader_vs(struct pipe_context *ctx, struct si_pipe_shader *shader) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pm4_state *pm4; unsigned num_sgprs, num_user_sgprs; unsigned nparams, i, vgpr_comp_cnt; @@ -117,7 +117,7 @@ static void si_pipe_shader_vs(struct pipe_context *ctx, struct si_pipe_shader *s static void si_pipe_shader_ps(struct pipe_context *ctx, struct si_pipe_shader *shader) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct si_pm4_state *pm4; unsigned i, exports_ps, spi_ps_in_control, db_shader_control; unsigned num_sgprs, num_user_sgprs; @@ -283,7 +283,7 @@ static unsigned r600_conv_prim_to_gs_out(unsigned mode) return prim_conv[mode]; } -static bool si_update_draw_info_state(struct r600_context *rctx, +static bool si_update_draw_info_state(struct si_context *rctx, const struct pipe_draw_info *info, const struct pipe_index_buffer *ib) { @@ -365,7 +365,7 @@ static bool si_update_draw_info_state(struct r600_context *rctx, return true; } -static void si_update_spi_map(struct r600_context *rctx) +static void si_update_spi_map(struct si_context *rctx) { struct si_shader *ps = &rctx->ps_shader->current->shader; struct si_shader *vs = &rctx->vs_shader->current->shader; @@ -422,7 +422,7 @@ bcolor: si_pm4_set_state(rctx, spi, pm4); } -static void si_update_derived_state(struct r600_context *rctx) +static void si_update_derived_state(struct si_context *rctx) { struct pipe_context * ctx = (struct pipe_context*)rctx; unsigned vs_dirty = 0, ps_dirty = 0; @@ -476,7 +476,7 @@ static void si_update_derived_state(struct r600_context *rctx) } } -static void si_vertex_buffer_update(struct r600_context *rctx) +static void si_vertex_buffer_update(struct si_context *rctx) { struct pipe_context *ctx = &rctx->b.b; struct si_pm4_state *pm4 = si_pm4_alloc_state(rctx); @@ -534,7 +534,7 @@ static void si_vertex_buffer_update(struct r600_context *rctx) si_pm4_set_state(rctx, vertex_buffers, pm4); } -static void si_state_draw(struct r600_context *rctx, +static void si_state_draw(struct si_context *rctx, const struct pipe_draw_info *info, const struct pipe_index_buffer *ib) { @@ -696,7 +696,7 @@ const struct r600_atom si_atom_cache_flush = { si_emit_cache_flush, 13 }; /* num void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) { - struct r600_context *rctx = (struct r600_context *)ctx; + struct si_context *rctx = (struct si_context *)ctx; struct pipe_index_buffer ib = {}; uint32_t i; diff --git a/src/gallium/drivers/radeonsi/si_translate.c b/src/gallium/drivers/radeonsi/si_translate.c index 158bdc8b0da..1b5acec90ea 100644 --- a/src/gallium/drivers/radeonsi/si_translate.c +++ b/src/gallium/drivers/radeonsi/si_translate.c @@ -28,7 +28,7 @@ #include "si_pipe.h" -void r600_translate_index_buffer(struct r600_context *r600, +void r600_translate_index_buffer(struct si_context *r600, struct pipe_index_buffer *ib, unsigned count) { diff --git a/src/gallium/drivers/radeonsi/si_uvd.c b/src/gallium/drivers/radeonsi/si_uvd.c index 847c8179992..397c697ae24 100644 --- a/src/gallium/drivers/radeonsi/si_uvd.c +++ b/src/gallium/drivers/radeonsi/si_uvd.c @@ -54,7 +54,7 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe, const struct pipe_video_buffer *tmpl) { - struct r600_context *ctx = (struct r600_context *)pipe; + struct si_context *ctx = (struct si_context *)pipe; struct r600_texture *resources[VL_NUM_COMPONENTS] = {}; struct radeon_surface *surfaces[VL_NUM_COMPONENTS] = {}; struct pb_buffer **pbs[VL_NUM_COMPONENTS] = {};