freedreno/ir3: remove input ncomp field

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Rob Clark <robclark@gmail.com>
This commit is contained in:
Jonathan Marek 2019-10-06 20:53:41 -04:00
parent ce23bc9283
commit 08003c37b9
4 changed files with 2 additions and 6 deletions

View file

@ -2396,7 +2396,6 @@ setup_input(struct ir3_context *ctx, nir_variable *in)
so->inputs[n].compmask = (1 << (ncomp + frac)) - 1;
so->inputs_count = MAX2(so->inputs_count, n + 1);
so->inputs[n].interpolate = in->data.interpolation;
so->inputs[n].ncomp = ncomp;
if (ctx->so->type == MESA_SHADER_FRAGMENT) {
@ -2513,7 +2512,6 @@ pack_inlocs(struct ir3_context *ctx)
for (unsigned i = 0; i < so->inputs_count; i++) {
unsigned compmask = 0, maxcomp = 0;
so->inputs[i].ncomp = 0;
so->inputs[i].inloc = inloc;
so->inputs[i].bary = false;
@ -2523,7 +2521,6 @@ pack_inlocs(struct ir3_context *ctx)
compmask |= (1 << j);
actual_in++;
so->inputs[i].ncomp++;
maxcomp = j + 1;
/* at this point, since used_components[i] mask is only

View file

@ -451,7 +451,6 @@ struct ir3_shader_variant {
uint8_t slot;
uint8_t regid;
uint8_t compmask;
uint8_t ncomp;
/* location of input (ie. offset passed to bary.f, etc). This
* matches the SP_VS_VPC_DST_REG.OUTLOCn value (a3xx and a4xx
* have the OUTLOCn value offset by 8, presumably to account

View file

@ -441,7 +441,7 @@ fd3_emit_vertex_bufs(struct fd_ringbuffer *ring, struct fd3_emit *emit)
COND(isint, A3XX_VFD_DECODE_INSTR_INT) |
COND(switchnext, A3XX_VFD_DECODE_INSTR_SWITCHNEXT));
total_in += vp->inputs[i].ncomp;
total_in += util_bitcount(vp->inputs[i].compmask);
j++;
}
}

View file

@ -443,7 +443,7 @@ fd4_emit_vertex_bufs(struct fd_ringbuffer *ring, struct fd4_emit *emit)
COND(isint, A4XX_VFD_DECODE_INSTR_INT) |
COND(switchnext, A4XX_VFD_DECODE_INSTR_SWITCHNEXT));
total_in += vp->inputs[i].ncomp;
total_in += util_bitcount(vp->inputs[i].compmask);
j++;
}
}