From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 25 Jun 2015 04:39:07 +0000 (-0700)
Subject: nir/spirv: Fix up some dererf ralloc parenting
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d178e15567e6c8c4629ae0af7854bdecb129831a;p=mesa.git

nir/spirv: Fix up some dererf ralloc parenting
---

diff --git a/src/glsl/nir/spirv_to_nir.c b/src/glsl/nir/spirv_to_nir.c
index 37334edd0df..2b7eda39008 100644
--- a/src/glsl/nir/spirv_to_nir.c
+++ b/src/glsl/nir/spirv_to_nir.c
@@ -571,7 +571,7 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
          exec_list_push_tail(&b->shader->globals, &var->node);
       }
 
-      val->deref = nir_deref_var_create(b->shader, var);
+      val->deref = nir_deref_var_create(b, var);
 
       vtn_foreach_decoration(b, val, var_decoration_cb, var);
       break;
@@ -846,7 +846,7 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode,
    instr->is_array = glsl_sampler_type_is_array(sampler_type);
    instr->is_shadow = glsl_sampler_type_is_shadow(sampler_type);
 
-   instr->sampler = sampler;
+   instr->sampler = nir_deref_as_var(nir_copy_deref(instr, &sampler->deref));
 
    nir_ssa_dest_init(&instr->instr, &instr->dest, 4, NULL);
    val->ssa = &instr->dest.ssa;