Module: Mesa Branch: master Commit: a77cb724da62920476073566728fbaf9db341dc4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a77cb724da62920476073566728fbaf9db341dc4
Author: Eric Anholt <[email protected]> Date: Thu Jun 28 12:33:43 2018 -0700 v3d: Move GL shader state dumping out of per-version compilation. It doesn't depend on V3D_VER, since it's just calling v3d_print_group. --- src/broadcom/clif/clif_dump.c | 35 ++++++++++++++++++++++++++--------- src/broadcom/clif/clif_private.h | 9 --------- src/broadcom/clif/v3dx_dump.c | 23 ----------------------- 3 files changed, 26 insertions(+), 41 deletions(-) diff --git a/src/broadcom/clif/clif_dump.c b/src/broadcom/clif/clif_dump.c index 1f57a6dbad..ea9cee00e9 100644 --- a/src/broadcom/clif/clif_dump.c +++ b/src/broadcom/clif/clif_dump.c @@ -119,6 +119,29 @@ clif_dump_cl(struct clif_dump *clif, uint32_t start, uint32_t end) } static void +clif_dump_gl_shader_state_record(struct clif_dump *clif, + struct reloc_worklist_entry *reloc, + void *vaddr) +{ + struct v3d_group *state = v3d_spec_find_struct(clif->spec, + "GL Shader State Record"); + struct v3d_group *attr = v3d_spec_find_struct(clif->spec, + "GL Shader State Attribute Record"); + assert(state); + assert(attr); + + out(clif, "GL Shader State Record at 0x%08x\n", reloc->addr); + v3d_print_group(clif->out, 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, ""); + vaddr += v3d_group_get_length(attr); + } +} + +static void clif_process_worklist(struct clif_dump *clif) { while (!list_empty(&clif->worklist)) { @@ -136,15 +159,9 @@ clif_process_worklist(struct clif_dump *clif) switch (reloc->type) { case reloc_gl_shader_state: - if (clif->devinfo->ver >= 41) { - v3d41_clif_dump_gl_shader_state_record(clif, - reloc, - vaddr); - } else { - v3d33_clif_dump_gl_shader_state_record(clif, - reloc, - vaddr); - } + clif_dump_gl_shader_state_record(clif, + reloc, + vaddr); break; case reloc_generic_tile_list: clif_dump_cl(clif, reloc->addr, diff --git a/src/broadcom/clif/clif_private.h b/src/broadcom/clif/clif_private.h index 87de17697d..376daef80d 100644 --- a/src/broadcom/clif/clif_private.h +++ b/src/broadcom/clif/clif_private.h @@ -69,19 +69,10 @@ clif_dump_add_address_to_worklist(struct clif_dump *clif, bool v3d33_clif_dump_packet(struct clif_dump *clif, uint32_t offset, const uint8_t *cl, uint32_t *size); -void v3d33_clif_dump_gl_shader_state_record(struct clif_dump *clif, - struct reloc_worklist_entry *reloc, - void *vaddr); bool v3d41_clif_dump_packet(struct clif_dump *clif, uint32_t offset, const uint8_t *cl, uint32_t *size); -void v3d41_clif_dump_gl_shader_state_record(struct clif_dump *clif, - struct reloc_worklist_entry *reloc, - void *vaddr); bool v3d42_clif_dump_packet(struct clif_dump *clif, uint32_t offset, const uint8_t *cl, uint32_t *size); -void v3d42_clif_dump_gl_shader_state_record(struct clif_dump *clif, - struct reloc_worklist_entry *reloc, - void *vaddr); static inline void out(struct clif_dump *clif, const char *fmt, ...) diff --git a/src/broadcom/clif/v3dx_dump.c b/src/broadcom/clif/v3dx_dump.c index b1d16551d7..72c0d444b7 100644 --- a/src/broadcom/clif/v3dx_dump.c +++ b/src/broadcom/clif/v3dx_dump.c @@ -138,26 +138,3 @@ v3dX(clif_dump_packet)(struct clif_dump *clif, uint32_t offset, return true; } - -void -v3dX(clif_dump_gl_shader_state_record)(struct clif_dump *clif, - struct reloc_worklist_entry *reloc, - void *vaddr) -{ - struct v3d_group *state = v3d_spec_find_struct(clif->spec, - "GL Shader State Record"); - struct v3d_group *attr = v3d_spec_find_struct(clif->spec, - "GL Shader State Attribute Record"); - assert(state); - assert(attr); - - out(clif, "GL Shader State Record at 0x%08x\n", reloc->addr); - v3d_print_group(clif->out, 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, ""); - vaddr += v3d_group_get_length(attr); - } -} _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
