diff options
| author | Eric Anholt <[email protected]> | 2018-06-25 11:01:44 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-07-27 17:08:35 -0700 |
| commit | e92959c4e03cf17b7cd829e2e56162604069abe6 (patch) | |
| tree | 5bb1159faf3d7d1077dd313c016d7a52d43bdfe1 /src/broadcom/clif | |
| parent | 77207e53806790e5edf3002a84d7105e646e22cb (diff) | |
v3d: Pass the whole clif_dump structure to v3d_print_group().
To generate CLIF files that the v3dv3 simulator can parse, we're going to
need to decode addresses, and for that we'll need the vaddr lookup
function from the clif structure from within v3d_decoder.
Diffstat (limited to 'src/broadcom/clif')
| -rw-r--r-- | src/broadcom/clif/clif_dump.c | 4 | ||||
| -rw-r--r-- | src/broadcom/clif/v3dx_dump.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/broadcom/clif/clif_dump.c b/src/broadcom/clif/clif_dump.c index ea9cee00e93..ca8d6d3e6fd 100644 --- a/src/broadcom/clif/clif_dump.c +++ b/src/broadcom/clif/clif_dump.c @@ -131,12 +131,12 @@ clif_dump_gl_shader_state_record(struct clif_dump *clif, assert(attr); out(clif, "GL Shader State Record at 0x%08x\n", reloc->addr); - v3d_print_group(clif->out, state, 0, vaddr, ""); + v3d_print_group(clif, state, 0, vaddr, ""); vaddr += v3d_group_get_length(state); for (int i = 0; i < reloc->shader_state.num_attrs; i++) { out(clif, " Attribute %d\n", i); - v3d_print_group(clif->out, attr, 0, vaddr, ""); + v3d_print_group(clif, attr, 0, vaddr, ""); vaddr += v3d_group_get_length(attr); } } diff --git a/src/broadcom/clif/v3dx_dump.c b/src/broadcom/clif/v3dx_dump.c index 72c0d444b7a..2229fe9d25c 100644 --- a/src/broadcom/clif/v3dx_dump.c +++ b/src/broadcom/clif/v3dx_dump.c @@ -47,7 +47,7 @@ v3dX(clif_dump_packet)(struct clif_dump *clif, uint32_t offset, *size = v3d_group_get_length(inst); out(clif, "%s\n", v3d_group_get_name(inst)); - v3d_print_group(clif->out, inst, 0, cl, ""); + v3d_print_group(clif, inst, 0, cl, ""); switch (*cl) { case V3DX(GL_SHADER_STATE_opcode): { @@ -87,7 +87,7 @@ v3dX(clif_dump_packet)(struct clif_dump *clif, uint32_t offset, cl += *size; for (int i = 0; i < values.number_of_16_bit_output_data_specs_following; i++) { - v3d_print_group(clif->out, spec, 0, cl, ""); + v3d_print_group(clif, spec, 0, cl, ""); cl += v3d_group_get_length(spec); *size += v3d_group_get_length(spec); } @@ -107,13 +107,13 @@ v3dX(clif_dump_packet)(struct clif_dump *clif, uint32_t offset, cl += *size; for (int i = 0; i < values.number_of_16_bit_output_data_specs_following; i++) { - v3d_print_group(clif->out, spec, 0, cl, ""); + v3d_print_group(clif, spec, 0, cl, ""); cl += v3d_group_get_length(spec); *size += v3d_group_get_length(spec); } for (int i = 0; i < values.number_of_32_bit_output_buffer_address_following; i++) { - v3d_print_group(clif->out, addr, 0, cl, ""); + v3d_print_group(clif, addr, 0, cl, ""); cl += v3d_group_get_length(addr); *size += v3d_group_get_length(addr); } |