From 45578def716f17e4588c6567a5fb3b6dc9569aec Mon Sep 17 00:00:00 2001 From: Andreas Hartmetz Date: Tue, 7 Jan 2014 02:40:22 +0100 Subject: [PATCH] radeonsi: Rename r600->si for functions in si_pipe.h. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_blit.c | 18 +++++----- src/gallium/drivers/radeonsi/si_buffer.c | 4 +-- src/gallium/drivers/radeonsi/si_hw_context.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.c | 22 ++++++------ src/gallium/drivers/radeonsi/si_pipe.h | 38 ++++++++++---------- src/gallium/drivers/radeonsi/si_query.c | 2 +- src/gallium/drivers/radeonsi/si_resource.c | 2 +- src/gallium/drivers/radeonsi/si_shader.c | 2 +- src/gallium/drivers/radeonsi/si_state.c | 4 +-- src/gallium/drivers/radeonsi/si_state_draw.c | 6 ++-- src/gallium/drivers/radeonsi/si_translate.c | 6 ++-- src/gallium/drivers/radeonsi/si_uvd.c | 8 ++--- 12 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index d2725a923a9..7883202b9db 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -108,12 +108,12 @@ static unsigned u_max_sample(struct pipe_resource *r) return r->nr_samples ? r->nr_samples - 1 : 0; } -static void r600_blit_decompress_depth(struct pipe_context *ctx, - struct r600_texture *texture, - struct r600_texture *staging, - unsigned first_level, unsigned last_level, - unsigned first_layer, unsigned last_layer, - unsigned first_sample, unsigned last_sample) +static void si_blit_decompress_depth(struct pipe_context *ctx, + struct r600_texture *texture, + struct r600_texture *staging, + unsigned first_level, unsigned last_level, + unsigned first_layer, unsigned last_layer, + unsigned first_sample, unsigned last_sample) { struct si_context *rctx = (struct si_context *)ctx; unsigned layer, level, sample, checked_last_layer, max_layer, max_sample; @@ -299,8 +299,8 @@ static void r600_blit_decompress_color(struct pipe_context *ctx, } } -void r600_decompress_color_textures(struct si_context *rctx, - struct si_textures_info *textures) +void si_decompress_color_textures(struct si_context *rctx, + struct si_textures_info *textures) { unsigned i; unsigned mask = textures->compressed_colortex_mask; @@ -700,5 +700,5 @@ void si_init_blit_functions(struct si_context *rctx) rctx->b.b.resource_copy_region = r600_resource_copy_region; rctx->b.b.blit = si_blit; rctx->b.b.flush_resource = si_flush_resource; - rctx->b.blit_decompress_depth = r600_blit_decompress_depth; + rctx->b.blit_decompress_depth = si_blit_decompress_depth; } diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c index 8ea19fbdd45..8261deb1c98 100644 --- a/src/gallium/drivers/radeonsi/si_buffer.c +++ b/src/gallium/drivers/radeonsi/si_buffer.c @@ -35,8 +35,8 @@ #include "si.h" #include "si_pipe.h" -void r600_upload_index_buffer(struct si_context *rctx, - struct pipe_index_buffer *ib, unsigned count) +void si_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); diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c index b978a6c3c89..f37e591fda9 100644 --- a/src/gallium/drivers/radeonsi/si_hw_context.c +++ b/src/gallium/drivers/radeonsi/si_hw_context.c @@ -169,7 +169,7 @@ void si_need_cs_space(struct si_context *ctx, unsigned num_dw, /* Flush if there's not enough space. */ if (num_dw > RADEON_MAX_CMDBUF_DWORDS) { - radeonsi_flush(&ctx->b.b, NULL, RADEON_FLUSH_ASYNC); + si_flush(&ctx->b.b, NULL, RADEON_FLUSH_ASYNC); } } diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index d0afe21b0b3..2f0a4d670dd 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -54,8 +54,8 @@ /* * pipe_context */ -void radeonsi_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence, - unsigned flags) +void si_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence, + unsigned flags) { struct si_context *rctx = (struct si_context *)ctx; struct pipe_query *render_cond = NULL; @@ -86,13 +86,13 @@ static void r600_flush_from_st(struct pipe_context *ctx, struct pipe_fence_handle **fence, unsigned flags) { - radeonsi_flush(ctx, fence, - flags & PIPE_FLUSH_END_OF_FRAME ? RADEON_FLUSH_END_OF_FRAME : 0); + si_flush(ctx, fence, + flags & PIPE_FLUSH_END_OF_FRAME ? RADEON_FLUSH_END_OF_FRAME : 0); } static void r600_flush_from_winsys(void *ctx, unsigned flags) { - radeonsi_flush((struct pipe_context*)ctx, NULL, flags); + si_flush((struct pipe_context*)ctx, NULL, flags); } static void r600_destroy_context(struct pipe_context *context) @@ -144,13 +144,13 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void rctx->screen = rscreen; si_init_blit_functions(rctx); - r600_init_query_functions(rctx); - r600_init_context_resource_functions(rctx); + si_init_query_functions(rctx); + si_init_context_resource_functions(rctx); si_init_compute_functions(rctx); if (rscreen->b.info.has_uvd) { - rctx->b.b.create_video_codec = radeonsi_uvd_create_decoder; - rctx->b.b.create_video_buffer = radeonsi_video_buffer_create; + rctx->b.b.create_video_codec = si_uvd_create_decoder; + rctx->b.b.create_video_buffer = si_video_buffer_create; } else { rctx->b.b.create_video_codec = vl_create_decoder; rctx->b.b.create_video_buffer = vl_video_buffer_create; @@ -229,7 +229,7 @@ static const char* r600_get_vendor(struct pipe_screen* pscreen) return "X.Org"; } -const char *r600_get_llvm_processor_name(enum radeon_family family) +const char *si_get_llvm_processor_name(enum radeon_family family) { switch (family) { case CHIP_TAHITI: return "tahiti"; @@ -514,7 +514,7 @@ static int r600_get_compute_param(struct pipe_screen *screen, //TODO: select these params by asic switch (param) { case PIPE_COMPUTE_CAP_IR_TARGET: { - const char *gpu = r600_get_llvm_processor_name(rscreen->b.family); + const char *gpu = si_get_llvm_processor_name(rscreen->b.family); if (ret) { sprintf(ret, "%s-r600--", gpu); } diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index e55bca0b051..8fbadc74124 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -179,43 +179,43 @@ struct si_context { 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); +void si_decompress_color_textures(struct si_context *rctx, + struct si_textures_info *textures); /* si_buffer.c */ -void r600_upload_index_buffer(struct si_context *rctx, - struct pipe_index_buffer *ib, unsigned count); +void si_upload_index_buffer(struct si_context *rctx, + struct pipe_index_buffer *ib, unsigned count); /* si_pipe.c */ -void radeonsi_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence, - unsigned flags); -const char *r600_get_llvm_processor_name(enum radeon_family family); +void si_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence, + unsigned flags); +const char *si_get_llvm_processor_name(enum radeon_family family); /* si_query.c */ -void r600_init_query_functions(struct si_context *rctx); +void si_init_query_functions(struct si_context *rctx); /* si_resource.c */ -void r600_init_context_resource_functions(struct si_context *r600); +void si_init_context_resource_functions(struct si_context *r600); /* si_translate.c */ -void r600_translate_index_buffer(struct si_context *r600, - struct pipe_index_buffer *ib, - unsigned count); +void si_translate_index_buffer(struct si_context *r600, + struct pipe_index_buffer *ib, + unsigned count); #if R600_TRACE_CS -void r600_trace_emit(struct si_context *rctx); +void si_trace_emit(struct si_context *rctx); #endif /* si_compute.c */ void si_init_compute_functions(struct si_context *rctx); /* si_uvd.c */ -struct pipe_video_codec *radeonsi_uvd_create_decoder(struct pipe_context *context, - const struct pipe_video_codec *templ); +struct pipe_video_codec *si_uvd_create_decoder(struct pipe_context *context, + const struct pipe_video_codec *templ); -struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe, - const struct pipe_video_buffer *tmpl); +struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe, + const struct pipe_video_buffer *tmpl); /* * common helpers @@ -244,7 +244,7 @@ static INLINE unsigned si_map_swizzle(unsigned swizzle) } } -static inline unsigned r600_tex_aniso_filter(unsigned filter) +static inline unsigned si_tex_aniso_filter(unsigned filter) { if (filter <= 1) return 0; if (filter <= 2) return 1; @@ -254,7 +254,7 @@ static inline unsigned r600_tex_aniso_filter(unsigned filter) } /* 12.4 fixed-point */ -static INLINE unsigned r600_pack_float_12p4(float x) +static INLINE unsigned si_pack_float_12p4(float x) { return x <= 0 ? 0 : x >= 4096 ? 0xffff : x * 16; diff --git a/src/gallium/drivers/radeonsi/si_query.c b/src/gallium/drivers/radeonsi/si_query.c index a847c562aee..24a9fd84c42 100644 --- a/src/gallium/drivers/radeonsi/si_query.c +++ b/src/gallium/drivers/radeonsi/si_query.c @@ -134,7 +134,7 @@ static void r600_render_condition(struct pipe_context *ctx, } } -void r600_init_query_functions(struct si_context *rctx) +void si_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 7d5c563fc68..3b4f6096c4d 100644 --- a/src/gallium/drivers/radeonsi/si_resource.c +++ b/src/gallium/drivers/radeonsi/si_resource.c @@ -52,7 +52,7 @@ void si_init_screen_resource_functions(struct pipe_screen *screen) screen->resource_destroy = u_resource_destroy_vtbl; } -void r600_init_context_resource_functions(struct si_context *r600) +void si_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_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 803de344c2a..78c02da7802 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1899,7 +1899,7 @@ int si_compile_llvm(struct si_context *rctx, struct si_pipe_shader *shader, shader->selector ? shader->selector->tokens : NULL); memset(&binary, 0, sizeof(binary)); radeon_llvm_compile(mod, &binary, - r600_get_llvm_processor_name(rctx->screen->b.family), dump); + si_get_llvm_processor_name(rctx->screen->b.family), dump); if (dump && ! binary.disassembled) { fprintf(stderr, "SI CODE:\n"); for (i = 0; i < binary.code_size; i+=4 ) { diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index a6f0548c60c..9ce0955e62d 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -610,8 +610,8 @@ static void *si_create_rs_state(struct pipe_context *ctx, } /* Divide by two, because 0.5 = 1 pixel. */ si_pm4_set_reg(pm4, R_028A04_PA_SU_POINT_MINMAX, - S_028A04_MIN_SIZE(r600_pack_float_12p4(psize_min/2)) | - S_028A04_MAX_SIZE(r600_pack_float_12p4(psize_max/2))); + S_028A04_MIN_SIZE(si_pack_float_12p4(psize_min/2)) | + S_028A04_MAX_SIZE(si_pack_float_12p4(psize_max/2))); tmp = (unsigned)state->line_width * 8; si_pm4_set_reg(pm4, R_028A08_PA_SU_LINE_CNTL, S_028A08_WIDTH(tmp)); diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index e9ffedfd4fe..e24f0a393c5 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -434,7 +434,7 @@ static void si_update_derived_state(struct si_context *rctx) si_flush_depth_textures(rctx, &rctx->samplers[i]); } if (rctx->samplers[i].compressed_colortex_mask) { - r600_decompress_color_textures(rctx, &rctx->samplers[i]); + si_decompress_color_textures(rctx, &rctx->samplers[i]); } } } @@ -717,10 +717,10 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) ib.offset = rctx->index_buffer.offset + info->start * ib.index_size; /* Translate or upload, if needed. */ - r600_translate_index_buffer(rctx, &ib, info->count); + si_translate_index_buffer(rctx, &ib, info->count); if (ib.user_buffer && !ib.buffer) { - r600_upload_index_buffer(rctx, &ib, info->count); + si_upload_index_buffer(rctx, &ib, info->count); } } diff --git a/src/gallium/drivers/radeonsi/si_translate.c b/src/gallium/drivers/radeonsi/si_translate.c index 1b5acec90ea..233fedec132 100644 --- a/src/gallium/drivers/radeonsi/si_translate.c +++ b/src/gallium/drivers/radeonsi/si_translate.c @@ -28,9 +28,9 @@ #include "si_pipe.h" -void r600_translate_index_buffer(struct si_context *r600, - struct pipe_index_buffer *ib, - unsigned count) +void si_translate_index_buffer(struct si_context *r600, + struct pipe_index_buffer *ib, + unsigned count) { struct pipe_resource *out_buffer = NULL; unsigned out_offset; diff --git a/src/gallium/drivers/radeonsi/si_uvd.c b/src/gallium/drivers/radeonsi/si_uvd.c index 397c697ae24..8d3dccadf94 100644 --- a/src/gallium/drivers/radeonsi/si_uvd.c +++ b/src/gallium/drivers/radeonsi/si_uvd.c @@ -51,8 +51,8 @@ /** * creates an video buffer with an UVD compatible memory layout */ -struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe, - const struct pipe_video_buffer *tmpl) +struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe, + const struct pipe_video_buffer *tmpl) { struct si_context *ctx = (struct si_context *)pipe; struct r600_texture *resources[VL_NUM_COMPONENTS] = {}; @@ -146,8 +146,8 @@ static struct radeon_winsys_cs_handle* radeonsi_uvd_set_dtb(struct ruvd_msg *msg /** * creates an UVD compatible decoder */ -struct pipe_video_codec *radeonsi_uvd_create_decoder(struct pipe_context *context, - const struct pipe_video_codec *templ) +struct pipe_video_codec *si_uvd_create_decoder(struct pipe_context *context, + const struct pipe_video_codec *templ) { return ruvd_create_decoder(context, templ, radeonsi_uvd_set_dtb); } -- 2.30.2