From 794355e77167291a3acc8d42249c760c24f54f38 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 10 Sep 2015 13:56:08 -0700 Subject: [PATCH] nir/lower_outputs_to_temporaries: Reparent the output name We copy the output, make the old output the temporary, and give the temporary a new name. The copy keeps the pointer to the old name. This works just fine up until the point where we lower things to SSA and delete the old variable and, with it, the name. Instead, we should re-parent to the copy. Reviewed-by: Eduardo Lima Mitev --- src/glsl/nir/nir_lower_outputs_to_temporaries.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/glsl/nir/nir_lower_outputs_to_temporaries.c b/src/glsl/nir/nir_lower_outputs_to_temporaries.c index b730cad0020..4ea5fd4f66b 100644 --- a/src/glsl/nir/nir_lower_outputs_to_temporaries.c +++ b/src/glsl/nir/nir_lower_outputs_to_temporaries.c @@ -91,6 +91,9 @@ nir_lower_outputs_to_temporaries(nir_shader *shader) /* The orignal is now the temporary */ nir_variable *temp = var; + /* Reparent the name to the new variable */ + ralloc_steal(output, output->name); + /* Give the output a new name with @out-temp appended */ temp->name = ralloc_asprintf(var, "%s@out-temp", output->name); temp->data.mode = nir_var_global; -- 2.30.2