Module: Mesa Branch: master Commit: 98ebffc9f305d6964649b8d8ec41e47c5458caa9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=98ebffc9f305d6964649b8d8ec41e47c5458caa9
Author: Christian Gmeiner <[email protected]> Date: Fri Oct 30 19:31:54 2020 +0100 etnaviv: move etna_destroy_shader(..) to generic location Before this change we had two identical etna_destroy_shader functions - one for tgsi and one for nir. Signed-off-by: Christian Gmeiner <[email protected]> Reviewed-by: Lucas Stach <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7397> --- src/gallium/drivers/etnaviv/etnaviv_compiler.h | 3 --- src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c | 11 ----------- src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c | 11 ----------- src/gallium/drivers/etnaviv/etnaviv_shader.c | 16 ++++++++++++---- 4 files changed, 12 insertions(+), 29 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.h b/src/gallium/drivers/etnaviv/etnaviv_compiler.h index e7d977c4dd4..769cb8204ed 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler.h +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.h @@ -172,7 +172,4 @@ etna_link_shader_nir(struct etna_shader_link_info *info, const struct etna_shader_variant *vs, const struct etna_shader_variant *fs); -void -etna_destroy_shader_nir(struct etna_shader_variant *shader); - #endif diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index bbf5f45f7f2..90b2b9c4963 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -1185,17 +1185,6 @@ etna_compile_shader_nir(struct etna_shader_variant *v) return result; } -void -etna_destroy_shader_nir(struct etna_shader_variant *shader) -{ - assert(shader); - - FREE(shader->code); - FREE(shader->uniforms.imm_data); - FREE(shader->uniforms.imm_contents); - FREE(shader); -} - static const struct etna_shader_inout * etna_shader_vs_lookup(const struct etna_shader_variant *sobj, const struct etna_shader_inout *in) diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c index 5ddc1cd9d1a..d6d12aef1ec 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c @@ -2501,17 +2501,6 @@ out: return ret; } -void -etna_destroy_shader(struct etna_shader_variant *shader) -{ - assert(shader); - - FREE(shader->code); - FREE(shader->uniforms.imm_data); - FREE(shader->uniforms.imm_contents); - FREE(shader); -} - static const struct etna_shader_inout * etna_shader_vs_lookup(const struct etna_shader_variant *sobj, const struct etna_shader_inout *in) diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c b/src/gallium/drivers/etnaviv/etnaviv_shader.c index eab551e3506..3f28e4db3ce 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_shader.c +++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c @@ -296,6 +296,17 @@ etna_shader_link(struct etna_context *ctx) return etna_link_shaders(ctx, &ctx->shader_state, ctx->shader.vs, ctx->shader.fs); } +void +etna_destroy_shader(struct etna_shader_variant *shader) +{ + assert(shader); + + FREE(shader->code); + FREE(shader->uniforms.imm_data); + FREE(shader->uniforms.imm_contents); + FREE(shader); +} + static bool etna_shader_update_vs_inputs(struct compiled_shader_state *cs, const struct etna_shader_variant *vs, @@ -490,10 +501,7 @@ etna_delete_shader_state(struct pipe_context *pctx, void *ss) if (t->bo) etna_bo_del(t->bo); - if (DBG_ENABLED(ETNA_DBG_NIR)) - etna_destroy_shader_nir(t); - else - etna_destroy_shader(t); + etna_destroy_shader(t); } tgsi_free_tokens(shader->tokens); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
