nir: use proper array sizing define for vectors
authorDave Airlie <airlied@redhat.com>
Wed, 3 Apr 2019 02:20:02 +0000 (12:20 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 3 Apr 2019 03:59:06 +0000 (13:59 +1000)
If we increase the vector size in the future it would be good
to not have to fix these up, this should change nothing at present.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
src/compiler/nir/nir_opt_copy_propagate.c

index 10b81c0a68435857ec2082cc5e84221fdf2de40b..909839ad962f9b71687ee6a0e7ec119bb917d988 100644 (file)
@@ -142,17 +142,17 @@ copy_prop_alu_src(nir_alu_instr *parent_alu_instr, unsigned index)
       return false;
 
    nir_ssa_def *def;
-   unsigned new_swizzle[4] = {0, 0, 0, 0};
+   unsigned new_swizzle[NIR_MAX_VEC_COMPONENTS] = {0, 0, 0, 0};
 
    if (alu_instr->op == nir_op_fmov ||
        alu_instr->op == nir_op_imov) {
-      for (unsigned i = 0; i < 4; i++)
+      for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++)
          new_swizzle[i] = alu_instr->src[0].swizzle[src->swizzle[i]];
       def = alu_instr->src[0].src.ssa;
    } else {
       def = NULL;
 
-      for (unsigned i = 0; i < 4; i++) {
+      for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++) {
          if (!nir_alu_instr_channel_used(parent_alu_instr, index, i))
             continue;
 
@@ -167,7 +167,7 @@ copy_prop_alu_src(nir_alu_instr *parent_alu_instr, unsigned index)
       }
    }
 
-   for (unsigned i = 0; i < 4; i++)
+   for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++)
       src->swizzle[i] = new_swizzle[i];
 
    nir_instr_rewrite_src(&parent_alu_instr->instr, &src->src,