diff --git a/src/compiler/nir/nir_lower_variable_initializers.c b/src/compiler/nir/nir_lower_variable_initializers.c
index 8539b96f182..9eabd0c726a 100644
--- a/src/compiler/nir/nir_lower_variable_initializers.c
+++ b/src/compiler/nir/nir_lower_variable_initializers.c
@@ -27,7 +27,13 @@
 static void
 build_constant_load(nir_builder *b, nir_deref_instr *deref, nir_constant *c)
 {
-   if (glsl_type_is_vector_or_scalar(deref->type)) {
+   if (glsl_type_is_cmat(deref->type)) {
+      const struct glsl_type *elem_type = glsl_get_cmat_element(deref->type);
+      assert(glsl_type_is_scalar(elem_type));
+      const unsigned bit_size = glsl_get_bit_size(elem_type);
+      nir_def *elem = nir_build_imm(b, 1, bit_size, c->values);
+      nir_cmat_construct(b, &deref->def, elem);
+   } else if (glsl_type_is_vector_or_scalar(deref->type)) {
       const unsigned num_components = glsl_get_vector_elements(deref->type);
       const unsigned bit_size = glsl_get_bit_size(deref->type);
       nir_def *imm = nir_build_imm(b, num_components, bit_size, c->values);
@@ -38,12 +44,6 @@ build_constant_load(nir_builder *b, nir_deref_instr *deref, nir_constant *c)
          build_constant_load(b, nir_build_deref_struct(b, deref, i),
                              c->elements[i]);
       }
-   } else if (glsl_type_is_cmat(deref->type)) {
-      const struct glsl_type *elem_type = glsl_get_cmat_element(deref->type);
-      assert(glsl_type_is_scalar(elem_type));
-      const unsigned bit_size = glsl_get_bit_size(elem_type);
-      nir_def *elem = nir_build_imm(b, 1, bit_size, c->values);
-      nir_cmat_construct(b, &deref->def, elem);
    } else {
       assert(glsl_type_is_array(deref->type) ||
              glsl_type_is_matrix(deref->type));