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 <christian.gmeiner@gmail.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7397>

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

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)

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)

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);