diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c index eb7f87b0aea..8ea19fbdd45 100644 --- a/src/gallium/drivers/radeonsi/si_buffer.c +++ b/src/gallium/drivers/radeonsi/si_buffer.c @@ -42,7 +42,7 @@ void r600_upload_index_buffer(struct si_context *rctx, ib->user_buffer, &ib->offset, &ib->buffer); } -void r600_upload_const_buffer(struct si_context *rctx, struct r600_resource **rbuffer, +void si_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 b53b1f65211..4ed0742ee41 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -134,7 +134,7 @@ static void radeonsi_launch_grid( memcpy(kernel_args + (num_work_size_bytes / 4), input, program->input_size); - r600_upload_const_buffer(rctx, &kernel_args_buffer, (uint8_t*)kernel_args, + si_upload_const_buffer(rctx, &kernel_args_buffer, (uint8_t*)kernel_args, kernel_args_size, &kernel_args_offset); kernel_args_va = r600_resource_va(ctx->screen, (struct pipe_resource*)kernel_args_buffer); diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index daf80e30f1b..dad4a9feec5 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -426,9 +426,9 @@ static void si_set_constant_buffer(struct pipe_context *ctx, uint shader, uint s if (input->user_buffer) { unsigned buffer_offset; - r600_upload_const_buffer(rctx, - (struct r600_resource**)&buffer, input->user_buffer, - input->buffer_size, &buffer_offset); + si_upload_const_buffer(rctx, + (struct r600_resource**)&buffer, input->user_buffer, + input->buffer_size, &buffer_offset); va = r600_resource_va(ctx->screen, buffer) + buffer_offset; } else { pipe_resource_reference(&buffer, input->buffer); diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c index bea2e6bd01f..550fba43ade 100644 --- a/src/gallium/drivers/radeonsi/si_hw_context.c +++ b/src/gallium/drivers/radeonsi/si_hw_context.c @@ -61,7 +61,7 @@ void si_get_backend_mask(struct si_context *ctx) /* otherwise backup path for older kernels */ /* create buffer for event data */ - buffer = r600_resource_create_custom(&ctx->screen->b.b, + buffer = si_resource_create_custom(&ctx->screen->b.b, PIPE_USAGE_STAGING, ctx->max_db*16); if (!buffer) @@ -623,7 +623,7 @@ struct si_query *r600_context_query_create(struct si_context *ctx, unsigned quer * being written by the gpu, hence staging is probably a good * usage pattern. */ - query->buffer = r600_resource_create_custom(&ctx->screen->b.b, + query->buffer = si_resource_create_custom(&ctx->screen->b.b, PIPE_USAGE_STAGING, buffer_size); if (!query->buffer) { diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 67c20b78aaa..d0afe21b0b3 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -643,7 +643,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws) rscreen->b.b.get_video_param = r600_get_video_param; rscreen->b.b.is_video_format_supported = vl_video_buffer_is_format_supported; } - r600_init_screen_resource_functions(&rscreen->b.b); + si_init_screen_resource_functions(&rscreen->b.b); if (!r600_common_screen_init(&rscreen->b, ws)) { FREE(rscreen); diff --git a/src/gallium/drivers/radeonsi/si_resource.c b/src/gallium/drivers/radeonsi/si_resource.c index 46a947d11b5..7d5c563fc68 100644 --- a/src/gallium/drivers/radeonsi/si_resource.c +++ b/src/gallium/drivers/radeonsi/si_resource.c @@ -44,7 +44,7 @@ static struct pipe_resource *r600_resource_from_handle(struct pipe_screen * scre } } -void r600_init_screen_resource_functions(struct pipe_screen *screen) +void si_init_screen_resource_functions(struct pipe_screen *screen) { screen->resource_create = r600_resource_create; screen->resource_from_handle = r600_resource_from_handle; diff --git a/src/gallium/drivers/radeonsi/si_resource.h b/src/gallium/drivers/radeonsi/si_resource.h index b088ebc5a19..9f97c866b0a 100644 --- a/src/gallium/drivers/radeonsi/si_resource.h +++ b/src/gallium/drivers/radeonsi/si_resource.h @@ -32,8 +32,8 @@ #include "util/u_inlines.h" static INLINE struct r600_resource * -r600_resource_create_custom(struct pipe_screen *screen, - unsigned usage, unsigned size) +si_resource_create_custom(struct pipe_screen *screen, + unsigned usage, unsigned size) { assert(size); return r600_resource(pipe_buffer_create(screen, @@ -44,12 +44,12 @@ struct si_surface { struct pipe_surface base; }; -void r600_init_screen_resource_functions(struct pipe_screen *screen); +void si_init_screen_resource_functions(struct pipe_screen *screen); struct si_context; -void r600_upload_const_buffer(struct si_context *rctx, struct r600_resource **rbuffer, - const uint8_t *ptr, unsigned size, - uint32_t *const_offset); +void si_upload_const_buffer(struct si_context *rctx, struct r600_resource **rbuffer, + const uint8_t *ptr, unsigned size, + uint32_t *const_offset); #endif diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index a24cf65e5b0..803de344c2a 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1941,7 +1941,7 @@ int si_compile_llvm(struct si_context *rctx, struct si_pipe_shader *shader, /* copy new shader */ r600_resource_reference(&shader->bo, NULL); - shader->bo = r600_resource_create_custom(rctx->b.b.screen, PIPE_USAGE_IMMUTABLE, + shader->bo = si_resource_create_custom(rctx->b.b.screen, PIPE_USAGE_IMMUTABLE, binary.code_size); if (shader->bo == NULL) { return -ENOMEM; diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 46fc36ee14e..a6f0548c60c 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2794,7 +2794,7 @@ static struct si_pm4_state *si_set_sampler_states(struct si_context *rctx, unsig rctx->border_color_offset = 0; rctx->border_color_table = - r600_resource_create_custom(&rctx->screen->b.b, + si_resource_create_custom(&rctx->screen->b.b, PIPE_USAGE_STAGING, 4096 * 4 * 4); }