diff options
author | Eric Anholt <[email protected]> | 2019-02-26 18:36:05 -0800 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2019-03-05 12:57:39 -0800 |
commit | 4739181a160cd941f7af78074c4f4ac7c6a1fd76 (patch) | |
tree | 7d48d8cc933f6446d01cebe94ed26262b8b0f749 /src/broadcom/compiler/vir_dump.c | |
parent | 1e98f02d887dada530595bc0c74292d4678c5e1a (diff) |
v3d: Switch implicit uniforms over to being any qinst->uniform != ~0.
I'm not sure why I didn't do this before -- it's clearly much simpler to
add dumping of the extra thing than to have it as another implicit source.
Diffstat (limited to 'src/broadcom/compiler/vir_dump.c')
-rw-r--r-- | src/broadcom/compiler/vir_dump.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/broadcom/compiler/vir_dump.c b/src/broadcom/compiler/vir_dump.c index b562fbf90e3..92ecc068530 100644 --- a/src/broadcom/compiler/vir_dump.c +++ b/src/broadcom/compiler/vir_dump.c @@ -260,8 +260,7 @@ static void vir_dump_alu(struct v3d_compile *c, struct qinst *inst) { struct v3d_qpu_instr *instr = &inst->qpu; - int nsrc = vir_get_non_sideband_nsrc(inst); - int sideband_nsrc = vir_get_nsrc(inst); + int nsrc = vir_get_nsrc(inst); enum v3d_qpu_input_unpack unpack[2]; if (inst->qpu.alu.add.op != V3D_QPU_A_NOP) { @@ -290,11 +289,10 @@ vir_dump_alu(struct v3d_compile *c, struct qinst *inst) unpack[1] = instr->alu.mul.b_unpack; } - for (int i = 0; i < sideband_nsrc; i++) { + for (int i = 0; i < nsrc; i++) { fprintf(stderr, ", "); vir_print_reg(c, inst, inst->src[i]); - if (i < nsrc) - fprintf(stderr, "%s", v3d_qpu_unpack_name(unpack[i])); + fprintf(stderr, "%s", v3d_qpu_unpack_name(unpack[i])); } vir_dump_sig(c, inst); @@ -355,14 +353,15 @@ vir_dump_inst(struct v3d_compile *c, struct qinst *inst) break; } } - - if (vir_has_implicit_uniform(inst)) { - fprintf(stderr, " "); - vir_print_reg(c, inst, inst->src[vir_get_implicit_uniform_src(inst)]); - } - break; } + + if (vir_has_uniform(inst)) { + fprintf(stderr, " ("); + vir_dump_uniform(c->uniform_contents[inst->uniform], + c->uniform_data[inst->uniform]); + fprintf(stderr, ")"); + } } void |