[Mesa-dev] [PATCH 14/55] radeonsi: rename si_begin_new_cs -> si_begin_new_gfx_cs

Marek Olšák maraeo at gmail.com
Mon Apr 2 04:08:07 UTC 2018


From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/radeonsi/si_hw_context.c | 8 ++++----
 src/gallium/drivers/radeonsi/si_pipe.c       | 2 +-
 src/gallium/drivers/radeonsi/si_pipe.h       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c
index 615e881..394df23 100644
--- a/src/gallium/drivers/radeonsi/si_hw_context.c
+++ b/src/gallium/drivers/radeonsi/si_hw_context.c
@@ -149,11 +149,11 @@ void si_flush_gfx_cs(void *context, unsigned flags,
 	if (ctx->current_saved_cs)
 		si_saved_cs_reference(&ctx->current_saved_cs, NULL);
 
-	si_begin_new_cs(ctx);
+	si_begin_new_gfx_cs(ctx);
 	ctx->gfx_flush_in_progress = false;
 }
 
-static void si_begin_cs_debug(struct si_context *ctx)
+static void si_begin_gfx_cs_debug(struct si_context *ctx)
 {
 	static const uint32_t zeros[1];
 	assert(!ctx->current_saved_cs);
@@ -183,10 +183,10 @@ static void si_begin_cs_debug(struct si_context *ctx)
 			      RADEON_USAGE_READWRITE, RADEON_PRIO_TRACE);
 }
 
-void si_begin_new_cs(struct si_context *ctx)
+void si_begin_new_gfx_cs(struct si_context *ctx)
 {
 	if (ctx->is_debug)
-		si_begin_cs_debug(ctx);
+		si_begin_gfx_cs_debug(ctx);
 
 	/* Flush read caches at the beginning of CS not flushed by the kernel. */
 	if (ctx->b.chip_class >= CIK)
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 7e7a8b7..c8ed549 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -331,7 +331,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
 	sctx->sample_mask.sample_mask = 0xffff;
 
 	/* these must be last */
-	si_begin_new_cs(sctx);
+	si_begin_new_gfx_cs(sctx);
 
 	if (sctx->b.chip_class >= GFX9) {
 		sctx->wait_mem_scratch = (struct r600_resource*)
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 9b9aa15..bc5a714 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -729,7 +729,7 @@ void si_init_screen_get_functions(struct si_screen *sscreen);
 void si_destroy_saved_cs(struct si_saved_cs *scs);
 void si_flush_gfx_cs(void *context, unsigned flags,
 		     struct pipe_fence_handle **fence);
-void si_begin_new_cs(struct si_context *ctx);
+void si_begin_new_gfx_cs(struct si_context *ctx);
 void si_need_gfx_cs_space(struct si_context *ctx);
 
 /* si_compute.c */
-- 
2.7.4



More information about the mesa-dev mailing list