From 95bc30275b3de7b856ffac9a1e438f7d246550dc Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 1 Apr 2018 16:40:30 -0400 Subject: radeonsi: switch radeon_add_to_buffer_list parameter to si_context Acked-by: Timothy Arceri --- src/gallium/drivers/radeon/r600_cs.h | 6 +++--- src/gallium/drivers/radeon/r600_query.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/gallium/drivers/radeon') diff --git a/src/gallium/drivers/radeon/r600_cs.h b/src/gallium/drivers/radeon/r600_cs.h index c90f06bdc6d..b0610f27f3e 100644 --- a/src/gallium/drivers/radeon/r600_cs.h +++ b/src/gallium/drivers/radeon/r600_cs.h @@ -64,14 +64,14 @@ radeon_cs_memory_below_limit(struct si_screen *screen, * The buffer list becomes empty after every context flush and must be * rebuilt. */ -static inline void radeon_add_to_buffer_list(struct r600_common_context *rctx, +static inline void radeon_add_to_buffer_list(struct si_context *sctx, struct radeon_winsys_cs *cs, struct r600_resource *rbo, enum radeon_bo_usage usage, enum radeon_bo_priority priority) { assert(usage); - rctx->ws->cs_add_buffer( + sctx->b.ws->cs_add_buffer( cs, rbo->buf, (enum radeon_bo_usage)(usage | RADEON_USAGE_SYNCHRONIZED), rbo->domains, priority); @@ -107,7 +107,7 @@ radeon_add_to_gfx_buffer_list_check_mem(struct si_context *sctx, sctx->b.gtt + rbo->gart_usage)) si_flush_gfx_cs(sctx, PIPE_FLUSH_ASYNC, NULL); - radeon_add_to_buffer_list(&sctx->b, sctx->b.gfx_cs, rbo, usage, priority); + radeon_add_to_buffer_list(sctx, sctx->b.gfx_cs, rbo, usage, priority); } static inline void radeon_set_config_reg_seq(struct radeon_winsys_cs *cs, unsigned reg, unsigned num) diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index 3348e757683..cf34a425e3b 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -786,7 +786,7 @@ static void r600_query_hw_do_emit_start(struct si_context *sctx, default: assert(0); } - radeon_add_to_buffer_list(&sctx->b, sctx->b.gfx_cs, query->buffer.buf, RADEON_USAGE_WRITE, + radeon_add_to_buffer_list(sctx, sctx->b.gfx_cs, query->buffer.buf, RADEON_USAGE_WRITE, RADEON_PRIO_QUERY); } @@ -878,7 +878,7 @@ static void r600_query_hw_do_emit_stop(struct si_context *sctx, default: assert(0); } - radeon_add_to_buffer_list(&sctx->b, sctx->b.gfx_cs, query->buffer.buf, RADEON_USAGE_WRITE, + radeon_add_to_buffer_list(sctx, sctx->b.gfx_cs, query->buffer.buf, RADEON_USAGE_WRITE, RADEON_PRIO_QUERY); if (fence_va) @@ -930,7 +930,7 @@ static void emit_set_predicate(struct si_context *ctx, radeon_emit(cs, va); radeon_emit(cs, op | ((va >> 32) & 0xFF)); } - radeon_add_to_buffer_list(&ctx->b, ctx->b.gfx_cs, buf, RADEON_USAGE_READ, + radeon_add_to_buffer_list(ctx, ctx->b.gfx_cs, buf, RADEON_USAGE_READ, RADEON_PRIO_QUERY); } -- cgit v1.2.3