r600g: cleanup some magic numbers

This commit is contained in:
Marek Olšák
2011-10-25 17:44:55 +02:00
parent dc651aff0c
commit 3d79347609
2 changed files with 16 additions and 4 deletions
+10 -4
View File
@@ -658,10 +658,16 @@ void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
rdraw.vgt_num_indices = draw.info.count;
rdraw.vgt_num_instances = draw.info.instance_count;
rdraw.vgt_index_type = ((draw.index_size == 4) ? 1 : 0);
if (R600_BIG_ENDIAN)
rdraw.vgt_index_type |= (draw.index_size >> 1) << 2;
rdraw.vgt_draw_initiator = draw.index_size ? 0 : 2;
rdraw.vgt_index_type = draw.index_size == 4 ? VGT_INDEX_32 : VGT_INDEX_16;
if (R600_BIG_ENDIAN) {
rdraw.vgt_index_type |= draw.index_size == 4 ? VGT_DMA_SWAP_32_BIT
: VGT_DMA_SWAP_16_BIT;
}
rdraw.vgt_draw_initiator = draw.index_size ? V_0287F0_DI_SRC_SEL_DMA
: V_0287F0_DI_SRC_SEL_AUTO_INDEX;
rdraw.indices = NULL;
if (draw.index_buffer) {
rbuffer = (struct r600_resource*)draw.index_buffer;
+6
View File
@@ -65,6 +65,12 @@
#define PKT3_CONTEXT_CONTROL 0x28
#define PKT3_DRAW_INDEX_IMMD_BE 0x29
#define PKT3_INDEX_TYPE 0x2A
#define VGT_INDEX_16 0
#define VGT_INDEX_32 1
#define VGT_DMA_SWAP_NONE (0 << 2)
#define VGT_DMA_SWAP_16_BIT (1 << 2)
#define VGT_DMA_SWAP_32_BIT (2 << 2)
#define VGT_DMA_SWAP_WORD (3 << 2)
#define PKT3_DRAW_INDEX 0x2B
#define PKT3_DRAW_INDEX_AUTO 0x2D
#define PKT3_DRAW_INDEX_IMMD 0x2E