OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: inline st_free_tokens

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Marek Olšák
2015-02-21 22:41:39 +01:00
parent b039302fb7
commit 94746cadc0
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mesa/state_tracker/st_mesa_to_tgsi.c
View File

@@ -1254,14 +1254,3 @@ out:
return ret; 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);
}

3
src/mesa/state_tracker/st_mesa_to_tgsi.h
View File

@@ -62,9 +62,6 @@ st_translate_mesa_program(
boolean passthrough_edgeflags, boolean passthrough_edgeflags,
boolean clamp_color); boolean clamp_color);
void
st_free_tokens(const struct tgsi_token *tokens);
unsigned unsigned
st_translate_texture_target(GLuint textarget, GLboolean shadow); st_translate_texture_target(GLuint textarget, GLboolean shadow);

6
src/mesa/state_tracker/st_program.c
View File

@@ -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 ); draw_delete_vertex_shader( st->draw, vpv->draw_shader );
if (vpv->tgsi.tokens) if (vpv->tgsi.tokens)
st_free_tokens(vpv->tgsi.tokens); ureg_free_tokens(vpv->tgsi.tokens);
free( vpv ); free( vpv );
} }
@@ -108,7 +108,7 @@ delete_fp_variant(struct st_context *st, struct st_fp_variant *fpv)
if (fpv->parameters) if (fpv->parameters)
_mesa_free_parameter_list(fpv->parameters); _mesa_free_parameter_list(fpv->parameters);
if (fpv->tgsi.tokens) if (fpv->tgsi.tokens)
st_free_tokens(fpv->tgsi.tokens); ureg_free_tokens(fpv->tgsi.tokens);
free(fpv); free(fpv);
} }
@@ -1183,7 +1183,7 @@ st_translate_geometry_program(struct st_context *st,
gpv->driver_shader = pipe->create_gs_state(pipe, &state); gpv->driver_shader = pipe->create_gs_state(pipe, &state);
gpv->key = *key; gpv->key = *key;
st_free_tokens(state.tokens); ureg_free_tokens(state.tokens);
return gpv; return gpv;
} }