From d90a6c2f234f4cc904bee0c87c84714b0f9033b6 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 30 May 2017 18:53:14 +0200 Subject: [PATCH] radeonsi: merge si_pm4_free_state_simple() into si_pm4_free_state() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuel Pitoiset Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_pm4.c | 9 ++------- src/gallium/drivers/radeonsi/si_pm4.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c index bf923ec1eb6..1bb6903feec 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.c +++ b/src/gallium/drivers/radeonsi/si_pm4.c @@ -110,12 +110,6 @@ void si_pm4_clear_state(struct si_pm4_state *state) state->ndw = 0; } -void si_pm4_free_state_simple(struct si_pm4_state *state) -{ - si_pm4_clear_state(state); - FREE(state); -} - void si_pm4_free_state(struct si_context *sctx, struct si_pm4_state *state, unsigned idx) @@ -127,7 +121,8 @@ void si_pm4_free_state(struct si_context *sctx, sctx->emitted.array[idx] = NULL; } - si_pm4_free_state_simple(state); + si_pm4_clear_state(state); + FREE(state); } void si_pm4_emit(struct si_context *sctx, struct si_pm4_state *state) diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h index 189c4819a55..78aa33be0d3 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.h +++ b/src/gallium/drivers/radeonsi/si_pm4.h @@ -72,7 +72,6 @@ void si_pm4_upload_indirect_buffer(struct si_context *sctx, struct si_pm4_state *state); void si_pm4_clear_state(struct si_pm4_state *state); -void si_pm4_free_state_simple(struct si_pm4_state *state); void si_pm4_free_state(struct si_context *sctx, struct si_pm4_state *state, unsigned idx); -- 2.30.2