diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-02-21 22:41:39 +0100 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-02-24 21:21:04 +0100 |
| commit | 94746cadc04c23add7750b446865b88297ff0a46 (patch) | |
| tree | 39a6fed7b15da1f503f8801d073af9b4e6deabf7 | |
| parent | b039302fb7b6ae5041ae77e14c6b18f34e70f28b (diff) | |
st/mesa: inline st_free_tokens
Reviewed-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | src/mesa/state_tracker/st_mesa_to_tgsi.c | 11 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_mesa_to_tgsi.h | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_program.c | 6 |
3 files changed, 3 insertions, 17 deletions
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c index 3dd8a14b657..4684421b525 100644 --- a/src/mesa/state_tracker/st_mesa_to_tgsi.c +++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c @@ -1254,14 +1254,3 @@ out: return ret; } - - -/** - * Tokens cannot be free with free otherwise the builtin gallium - * malloc debugging will get confused. - */ -void -st_free_tokens(const struct tgsi_token *tokens) -{ - ureg_free_tokens(tokens); -} diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.h b/src/mesa/state_tracker/st_mesa_to_tgsi.h index 1aa797a3217..62bb654e95a 100644 --- a/src/mesa/state_tracker/st_mesa_to_tgsi.h +++ b/src/mesa/state_tracker/st_mesa_to_tgsi.h @@ -62,9 +62,6 @@ st_translate_mesa_program( boolean passthrough_edgeflags, boolean clamp_color); -void -st_free_tokens(const struct tgsi_token *tokens); - unsigned st_translate_texture_target(GLuint textarget, GLboolean shadow); diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index d6e0d1b3c16..ec123fbdb4c 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -69,7 +69,7 @@ delete_vp_variant(struct st_context *st, struct st_vp_variant *vpv) draw_delete_vertex_shader( st->draw, vpv->draw_shader ); if (vpv->tgsi.tokens) - st_free_tokens(vpv->tgsi.tokens); + ureg_free_tokens(vpv->tgsi.tokens); free( vpv ); } @@ -108,7 +108,7 @@ delete_fp_variant(struct st_context *st, struct st_fp_variant *fpv) if (fpv->parameters) _mesa_free_parameter_list(fpv->parameters); if (fpv->tgsi.tokens) - st_free_tokens(fpv->tgsi.tokens); + ureg_free_tokens(fpv->tgsi.tokens); free(fpv); } @@ -1183,7 +1183,7 @@ st_translate_geometry_program(struct st_context *st, gpv->driver_shader = pipe->create_gs_state(pipe, &state); gpv->key = *key; - st_free_tokens(state.tokens); + ureg_free_tokens(state.tokens); return gpv; } |