nir: add type information to load uniform/input and store output intrinsics

[mesa.git] / src / compiler / nir / nir_lower_var_copies.c

diff --git a/src/compiler/nir/nir_lower_var_copies.c b/src/compiler/nir/nir_lower_var_copies.c
index 1e7ad7849344bea85eecf72f3cf088493a2fceb4..0ba398698f0dd9d0fa24f962bd4156a632fb6e96 100644 (file)
--- a/src/compiler/nir/nir_lower_var_copies.c
+++ b/src/compiler/nir/nir_lower_var_copies.c
@@ -75,15 +75,15 @@ emit_deref_copy_load_store(nir_builder *b,
       assert(length > 0);
 
       for (unsigned i = 0; i < length; i++) {
-         nir_ssa_def *index = nir_imm_int(b, i);
          emit_deref_copy_load_store(b,
-                                    nir_build_deref_array(b, dst_deref, index),
+                                    nir_build_deref_array_imm(b, dst_deref, i),
                                     dst_deref_arr + 1,
-                                    nir_build_deref_array(b, src_deref, index),
+                                    nir_build_deref_array_imm(b, src_deref, i),
                                     src_deref_arr + 1);
       }
    } else {
-      assert(dst_deref->type == src_deref->type);
+      assert(glsl_get_bare_type(dst_deref->type) ==
+             glsl_get_bare_type(src_deref->type));
       assert(glsl_type_is_vector_or_scalar(dst_deref->type));
 
       nir_store_deref(b, dst_deref, nir_load_deref(b, src_deref), ~0);