radeonsi: merge si_pm4_free_state_simple() into si_pm4_free_state()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c
index bf923ec1eb686e3f6ff89afa4b71680eee2393a0..1bb6903feece0f85c821d5a2b3cd7e0ff3b4eb17 100644 (file)
--- 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 189c4819a55c862068a874ab800e983b3b20e446..78aa33be0d3b7a97b5c80092b5780a288382e05c 100644 (file)
--- 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);