From: Marek Olšák Date: Sun, 30 Aug 2015 12:39:54 +0000 (+0200) Subject: radeonsi: remove si_pm4_cleanup X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b89fa63d45cc5c8b3eec0d38ba30c57a5ecf5565;p=mesa.git radeonsi: remove si_pm4_cleanup All remaining pm4 state are created and destroyed by state trackers. Reviewed-by: Alex Deucher Acked-by: Christian König --- diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index d68ea5fb31d..7dbb2e30422 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -72,8 +72,6 @@ static void si_destroy_context(struct pipe_context *context) if (sctx->blitter) util_blitter_destroy(sctx->blitter); - si_pm4_cleanup(sctx); - r600_common_context_cleanup(&sctx->b); #if HAVE_LLVM >= 0x0306 diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c index 1ae252a8629..b06e92b1fef 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.c +++ b/src/gallium/drivers/radeonsi/si_pm4.c @@ -153,10 +153,3 @@ void si_pm4_reset_emitted(struct si_context *sctx) { memset(&sctx->emitted, 0, sizeof(sctx->emitted)); } - -void si_pm4_cleanup(struct si_context *sctx) -{ - for (int i = 0; i < NUMBER_OF_STATES; ++i) { - si_pm4_free_state(sctx, sctx->queued.array[i], i); - } -} diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h index 7a8f5a02550..efa20628aab 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.h +++ b/src/gallium/drivers/radeonsi/si_pm4.h @@ -75,6 +75,5 @@ void si_pm4_free_state(struct si_context *sctx, void si_pm4_emit(struct si_context *sctx, struct si_pm4_state *state); void si_pm4_emit_dirty(struct si_context *sctx); void si_pm4_reset_emitted(struct si_context *sctx); -void si_pm4_cleanup(struct si_context *sctx); #endif