From d74bec1a544e8d2df5e92504bd095a542bb8a4ac Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 16 Aug 2017 08:43:08 -0700 Subject: [PATCH] spirv: Parent the nir_shader to the builder while building MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Tapani Pälli Reviewed-by: Ian Romanick --- src/compiler/spirv/spirv_to_nir.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index b36772caad1..353d99cc613 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -3351,7 +3351,7 @@ spirv_to_nir(const uint32_t *words, size_t word_count, return NULL; } - b->shader = nir_shader_create(NULL, stage, nir_options, NULL); + b->shader = nir_shader_create(b, stage, nir_options, NULL); /* Set shader info defaults */ b->shader->info.gs.invocations = 1; @@ -3390,6 +3390,9 @@ spirv_to_nir(const uint32_t *words, size_t word_count, nir_function *entry_point = b->entry_point->func->impl->function; assert(entry_point); + /* Unparent the shader from the vtn_builder before we delete the builder */ + ralloc_steal(NULL, b->shader); + ralloc_free(b); return entry_point; -- 2.30.2