radeonsi: Rename r600->si for functions in si_resource.h.
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
parent
a88f46bc9b
commit
f2a21ed8b9
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue