diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2019-08-12 18:40:17 +0200 |
|---|---|---|
| committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2019-08-12 23:44:17 +0200 |
| commit | cf93ddc48a491ffb98b7619b74705574d72ce635 (patch) | |
| tree | c8156364b1b298db4e645cc4a31071826e15c00f | |
| parent | 7ea158f3a68b2aa153b2c5b640bf77ab82baff82 (diff) | |
| download | mesa-cf93ddc48a491ffb98b7619b74705574d72ce635.tar.gz | |
etnaviv: move nir shader destroy call to etna_etna_delete_shader_state(..)
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
| -rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_compiler.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_shader.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.c b/src/gallium/drivers/etnaviv/etnaviv_compiler.c index e78c155f1b7..431c4217258 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.c @@ -2555,9 +2555,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 1dc53aa578f..fd6c5658244 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_shader.c +++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c @@ -412,7 +412,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); |