Module: Mesa
Branch: master
Commit: 1290cc3e27d32ef1b9dc4902c2276ee46a0b7862
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1290cc3e27d32ef1b9dc4902c2276ee46a0b7862
Author: Christian Gmeiner <christian.gmei...@gmail.com>
Date: Mon Aug 12 18:40:17 2019 +0200
etnaviv: split destroy_shader
Signed-off-by: Christian Gmeiner <christian.gmei...@gmail.com>
Reviewed-by: Jonathan Marek <jonat...@marek.ca>
---
src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c | 3 ---
src/gallium/drivers/etnaviv/etnaviv_shader.c | 6 +++++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c
b/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c
index 3b8f43c5c2b..97750c7bd35 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_tgsi.c
@@ -2535,9 +2535,6 @@ etna_dump_shader(const struct etna_shader_variant *shader)
void
etna_destroy_shader(struct etna_shader_variant *shader)
{
- if (DBG_ENABLED(ETNA_DBG_NIR))
- return etna_destroy_shader_nir(shader);
-
assert(shader);
FREE(shader->code);
diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c
b/src/gallium/drivers/etnaviv/etnaviv_shader.c
index 1f0d117eac1..2a3a7569da7 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_shader.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c
@@ -417,7 +417,11 @@ etna_delete_shader_state(struct pipe_context *pctx, void
*ss)
v = v->next;
if (t->bo)
etna_bo_del(t->bo);
- etna_destroy_shader(t);
+
+ if (DBG_ENABLED(ETNA_DBG_NIR))
+ etna_destroy_shader_nir(t);
+ else
+ etna_destroy_shader(t);
}
ralloc_free(shader->nir);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
