From 42500d1dab7b617366191be7815695393225f274 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 1 Apr 2018 14:22:54 -0400 Subject: [PATCH] radeonsi: move si_destroy_saved_cs to si_debug.c Acked-by: Timothy Arceri --- src/gallium/drivers/radeonsi/si_debug.c | 7 +++++++ src/gallium/drivers/radeonsi/si_hw_context.c | 7 ------- src/gallium/drivers/radeonsi/si_pipe.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index 30b45ee..886f79d 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -37,6 +37,13 @@ static void si_dump_bo_list(struct si_context *sctx, DEBUG_GET_ONCE_OPTION(replace_shaders, "RADEON_REPLACE_SHADERS", NULL) +void si_destroy_saved_cs(struct si_saved_cs *scs) +{ + si_clear_saved_cs(&scs->gfx); + r600_resource_reference(&scs->trace_buf, NULL); + free(scs); +} + static void si_dump_shader(struct si_screen *sscreen, enum pipe_shader_type processor, const struct si_shader *shader, FILE *f) diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c index 6923e01..ab4adeb 100644 --- a/src/gallium/drivers/radeonsi/si_hw_context.c +++ b/src/gallium/drivers/radeonsi/si_hw_context.c @@ -26,13 +26,6 @@ #include "util/os_time.h" -void si_destroy_saved_cs(struct si_saved_cs *scs) -{ - si_clear_saved_cs(&scs->gfx); - r600_resource_reference(&scs->trace_buf, NULL); - free(scs); -} - /* initialize */ void si_need_gfx_cs_space(struct si_context *ctx) { diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index a9b706b..8973ad0 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -705,6 +705,7 @@ void cik_emit_prefetch_L2(struct si_context *sctx); void si_init_cp_dma_functions(struct si_context *sctx); /* si_debug.c */ +void si_destroy_saved_cs(struct si_saved_cs *scs); void si_auto_log_cs(void *data, struct u_log_context *log); void si_log_hw_flush(struct si_context *sctx); void si_log_draw_state(struct si_context *sctx, struct u_log_context *log); @@ -728,7 +729,6 @@ const char *si_get_family_name(const struct si_screen *sscreen); void si_init_screen_get_functions(struct si_screen *sscreen); /* si_hw_context.c */ -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_gfx_cs(struct si_context *ctx); -- 2.7.4