diff options
| author | Samuel Pitoiset <[email protected]> | 2017-05-30 18:53:14 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-05-31 09:20:53 +0200 |
| commit | d90a6c2f234f4cc904bee0c87c84714b0f9033b6 (patch) | |
| tree | a4929a3a80301228853d1a31a5f06fd03e389a66 /src/gallium | |
| parent | d8debc6aad85094baeba2014b46b6613c4a35ee7 (diff) | |
radeonsi: merge si_pm4_free_state_simple() into si_pm4_free_state()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pm4.c | 9 | ||||
| -rw-r--r-- | 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); |