nir: Add a new memory_barrier_tcs_patch intrinsic

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

diff --git a/src/compiler/nir/nir_lower_constant_initializers.c b/src/compiler/nir/nir_lower_constant_initializers.c
index abcd762d1692c58cd0ef6c4d90ea0810723003c4..d373c2336d2b265ab64a3029a2f6c2206f75191d 100644 (file)
--- a/src/compiler/nir/nir_lower_constant_initializers.c
+++ b/src/compiler/nir/nir_lower_constant_initializers.c
@@ -32,21 +32,9 @@ build_constant_load(nir_builder *b, nir_deref_instr *deref, nir_constant *c)
          nir_load_const_instr_create(b->shader,
                                      glsl_get_vector_elements(deref->type),
                                      glsl_get_bit_size(deref->type));
-      memcpy(load->value, c->values[0], sizeof(*load->value) * load->def.num_components);
+      memcpy(load->value, c->values, sizeof(*load->value) * load->def.num_components);
       nir_builder_instr_insert(b, &load->instr);
       nir_store_deref(b, deref, &load->def, ~0);
-   } else if (glsl_type_is_matrix(deref->type)) {
-      unsigned cols = glsl_get_matrix_columns(deref->type);
-      unsigned rows = glsl_get_vector_elements(deref->type);
-      unsigned bit_size = glsl_get_bit_size(deref->type);
-      for (unsigned i = 0; i < cols; i++) {
-         nir_load_const_instr *load =
-            nir_load_const_instr_create(b->shader, rows, bit_size);
-         memcpy(load->value, c->values[i], sizeof(*load->value) * load->def.num_components);
-         nir_builder_instr_insert(b, &load->instr);
-         nir_store_deref(b, nir_build_deref_array_imm(b, deref, i),
-                         &load->def, ~0);
-      }
    } else if (glsl_type_is_struct_or_ifc(deref->type)) {
       unsigned len = glsl_get_length(deref->type);
       for (unsigned i = 0; i < len; i++) {
@@ -54,7 +42,8 @@ build_constant_load(nir_builder *b, nir_deref_instr *deref, nir_constant *c)
                              c->elements[i]);
       }
    } else {
-      assert(glsl_type_is_array(deref->type));
+      assert(glsl_type_is_array(deref->type) ||
+             glsl_type_is_matrix(deref->type));
       unsigned len = glsl_get_length(deref->type);
       for (unsigned i = 0; i < len; i++) {
          build_constant_load(b,