diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-12-20 12:00:00 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-12-20 19:11:04 +0000 |
| commit | 0f84ecfc3cd7dfe7f43ff99a6498d2ceccd90225 (patch) | |
| tree | a78f7d5a969afc132fe838ef6bc7a77c258f26e6 /src/sna/kgem_debug_gen5.c | |
| parent | 1f4ede0ef8f8a8d07e11781ad05617ecdfcd3faf (diff) | |
sna/gen4+: Amalgamate all the gen4-7 vertex buffer emission
Having reduced all the vb code for these generations to the same set of
routines, we can refactor them into a single set of functions.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/kgem_debug_gen5.c')
| -rw-r--r-- | src/sna/kgem_debug_gen5.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/sna/kgem_debug_gen5.c b/src/sna/kgem_debug_gen5.c index e23ceb1f..8b55dd91 100644 --- a/src/sna/kgem_debug_gen5.c +++ b/src/sna/kgem_debug_gen5.c @@ -73,7 +73,7 @@ static void gen5_update_vertex_buffer(struct kgem *kgem, const uint32_t *data) int i, size; reloc = kgem_debug_get_reloc_entry(kgem, &data[1] - kgem->batch); - if (reloc->target_handle == 0) { + if (reloc->target_handle == -1) { base = kgem->batch; size = kgem->nbatch * sizeof(uint32_t); } else { @@ -529,20 +529,19 @@ int kgem_gen5_decode_3d(struct kgem *kgem, uint32_t offset) for (i = 1; i < len;) { gen5_update_vertex_elements(kgem, (i - 1)/2, data + i); - kgem_debug_print(data, offset, i, "buffer %d: %svalid, type 0x%04x, " - "src offset 0x%04x bytes\n", - data[i] >> 27, - data[i] & (1 << 26) ? "" : "in", - (data[i] >> 16) & 0x1ff, - data[i] & 0x07ff); + kgem_debug_print(data, offset, i, + "buffer %d: %svalid, type 0x%04x, " + "src offset 0x%04x bytes\n", + data[i] >> 27, + data[i] & (1 << 26) ? "" : "in", + (data[i] >> 16) & 0x1ff, + data[i] & 0x07ff); i++; - kgem_debug_print(data, offset, i, "(%s, %s, %s, %s), " - "dst offset 0x%02x bytes\n", + kgem_debug_print(data, offset, i, "(%s, %s, %s, %s)\n", get_965_element_component(data[i], 0), get_965_element_component(data[i], 1), get_965_element_component(data[i], 2), - get_965_element_component(data[i], 3), - (data[i] & 0xff) * 4); + get_965_element_component(data[i], 3)); i++; } state.num_ve = (len - 1) / 2; /* XXX? */ |