From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 13 Nov 2014 22:53:01 +0000 (-0800)
Subject: nir: Clean up nir_deref helper functions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8219ff1796ab18d19fe9cf3cf93f463a984e2c80;p=mesa.git

nir: Clean up nir_deref helper functions

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
---

diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c
index e988ca4f248..f63248ec4f1 100644
--- a/src/glsl/nir/nir.c
+++ b/src/glsl/nir/nir.c
@@ -542,6 +542,7 @@ static nir_deref_var *
 copy_deref_var(void *mem_ctx, nir_deref_var *deref)
 {
    nir_deref_var *ret = nir_deref_var_create(mem_ctx, deref->var);
+   ret->deref.type = deref->deref.type;
    if (deref->deref.child)
       ret->deref.child = nir_copy_deref(mem_ctx, deref->deref.child);
    return ret;
@@ -552,8 +553,10 @@ copy_deref_array(void *mem_ctx, nir_deref_array *deref)
 {
    nir_deref_array *ret = nir_deref_array_create(mem_ctx);
    ret->base_offset = deref->base_offset;
-   if (deref->has_indirect)
+   if (deref->has_indirect) {
+      ret->has_indirect = true;
       ret->indirect = deref->indirect;
+   }
    ret->deref.type = deref->deref.type;
    if (deref->deref.child)
       ret->deref.child = nir_copy_deref(mem_ctx, deref->deref.child);