From e90bae4376472a6996925f4bb57ae3ae7994c7e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 7 Dec 2014 15:53:01 +0100 Subject: [PATCH] radeonsi: remove unused draw packet functions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Michel Dänzer --- src/gallium/drivers/radeonsi/si_commands.c | 75 ---------------------- src/gallium/drivers/radeonsi/si_state.h | 12 ---- 2 files changed, 87 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_commands.c b/src/gallium/drivers/radeonsi/si_commands.c index bf1cb301721..04bc5b9b7fc 100644 --- a/src/gallium/drivers/radeonsi/si_commands.c +++ b/src/gallium/drivers/radeonsi/si_commands.c @@ -34,78 +34,3 @@ void si_cmd_context_control(struct si_pm4_state *pm4) si_pm4_cmd_add(pm4, 0x80000000); si_pm4_cmd_end(pm4, false); } - -void si_cmd_draw_index_2(struct si_pm4_state *pm4, uint32_t max_size, - uint64_t index_base, uint32_t index_count, - uint32_t initiator, bool predicate) -{ - si_pm4_cmd_begin(pm4, PKT3_DRAW_INDEX_2); - si_pm4_cmd_add(pm4, max_size); - si_pm4_cmd_add(pm4, index_base); - si_pm4_cmd_add(pm4, (index_base >> 32UL) & 0xFF); - si_pm4_cmd_add(pm4, index_count); - si_pm4_cmd_add(pm4, initiator); - si_pm4_cmd_end(pm4, predicate); -} - -void si_cmd_draw_index_auto(struct si_pm4_state *pm4, uint32_t count, - uint32_t initiator, bool predicate) -{ - si_pm4_cmd_begin(pm4, PKT3_DRAW_INDEX_AUTO); - si_pm4_cmd_add(pm4, count); - si_pm4_cmd_add(pm4, initiator); - si_pm4_cmd_end(pm4, predicate); -} - -void si_cmd_draw_indirect(struct si_pm4_state *pm4, uint64_t indirect_va, - uint32_t indirect_offset, uint32_t base_vtx_loc, - uint32_t start_inst_loc, bool predicate) -{ - assert(indirect_va % 8 == 0); - assert(indirect_offset % 4 == 0); - - si_pm4_cmd_begin(pm4, PKT3_SET_BASE); - si_pm4_cmd_add(pm4, 1); - si_pm4_cmd_add(pm4, indirect_va); - si_pm4_cmd_add(pm4, indirect_va >> 32); - si_pm4_cmd_end(pm4, predicate); - - si_pm4_cmd_begin(pm4, PKT3_DRAW_INDIRECT); - si_pm4_cmd_add(pm4, indirect_offset); - si_pm4_cmd_add(pm4, (base_vtx_loc - SI_SH_REG_OFFSET) >> 2); - si_pm4_cmd_add(pm4, (start_inst_loc - SI_SH_REG_OFFSET) >> 2); - si_pm4_cmd_add(pm4, V_0287F0_DI_SRC_SEL_AUTO_INDEX); - si_pm4_cmd_end(pm4, predicate); -} - -void si_cmd_draw_index_indirect(struct si_pm4_state *pm4, uint64_t indirect_va, - uint64_t index_va, uint32_t index_max_size, - uint32_t indirect_offset, uint32_t base_vtx_loc, - uint32_t start_inst_loc, bool predicate) -{ - assert(indirect_va % 8 == 0); - assert(index_va % 2 == 0); - assert(indirect_offset % 4 == 0); - - si_pm4_cmd_begin(pm4, PKT3_SET_BASE); - si_pm4_cmd_add(pm4, 1); - si_pm4_cmd_add(pm4, indirect_va); - si_pm4_cmd_add(pm4, indirect_va >> 32); - si_pm4_cmd_end(pm4, predicate); - - si_pm4_cmd_begin(pm4, PKT3_INDEX_BASE); - si_pm4_cmd_add(pm4, index_va); - si_pm4_cmd_add(pm4, index_va >> 32); - si_pm4_cmd_end(pm4, predicate); - - si_pm4_cmd_begin(pm4, PKT3_INDEX_BUFFER_SIZE); - si_pm4_cmd_add(pm4, index_max_size); - si_pm4_cmd_end(pm4, predicate); - - si_pm4_cmd_begin(pm4, PKT3_DRAW_INDEX_INDIRECT); - si_pm4_cmd_add(pm4, indirect_offset); - si_pm4_cmd_add(pm4, (base_vtx_loc - SI_SH_REG_OFFSET) >> 2); - si_pm4_cmd_add(pm4, (start_inst_loc - SI_SH_REG_OFFSET) >> 2); - si_pm4_cmd_add(pm4, V_0287F0_DI_SRC_SEL_DMA); - si_pm4_cmd_end(pm4, predicate); -} diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index be2e8580646..3c7d269c6eb 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -275,17 +275,5 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo); /* si_commands.c */ void si_cmd_context_control(struct si_pm4_state *pm4); -void si_cmd_draw_index_2(struct si_pm4_state *pm4, uint32_t max_size, - uint64_t index_base, uint32_t index_count, - uint32_t initiator, bool predicate); -void si_cmd_draw_index_auto(struct si_pm4_state *pm4, uint32_t count, - uint32_t initiator, bool predicate); -void si_cmd_draw_indirect(struct si_pm4_state *pm4, uint64_t indirect_va, - uint32_t indirect_offset, uint32_t base_vtx_loc, - uint32_t start_inst_loc, bool predicate); -void si_cmd_draw_index_indirect(struct si_pm4_state *pm4, uint64_t indirect_va, - uint64_t index_va, uint32_t index_max_size, - uint32_t indirect_offset, uint32_t base_vtx_loc, - uint32_t start_inst_loc, bool predicate); #endif -- 2.30.2