[Mesa-dev] [PATCH 37/42] radeonsi: remove si_pm4_cleanup
Marek Olšák
maraeo at gmail.com
Sun Aug 30 12:12:07 PDT 2015
From: Marek Olšák <marek.olsak at amd.com>
All remaining pm4 state are created and destroyed by state trackers.
---
src/gallium/drivers/radeonsi/si_pipe.c | 2 --
src/gallium/drivers/radeonsi/si_pm4.c | 7 -------
src/gallium/drivers/radeonsi/si_pm4.h | 1 -
3 files changed, 10 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index d68ea5f..7dbb2e3 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 1ae252a..b06e92b 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 7a8f5a0..efa2062 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
--
2.1.4
More information about the mesa-dev
mailing list