summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorZack Rusin <zackr@vmware.com>2013-08-06 20:25:53 -0400
committerZack Rusin <zackr@vmware.com>2013-08-08 20:54:03 -0400
commit1d425c4c6df2affd3b36b98e28357c59f7f02f58 (patch)
tree637b73ee59d30add455404f7aa38bc7e9f9511ca /src/gallium
parent57cd3267782fcf92d1e7d772760956516d4367df (diff)
draw: reset the vertex id when injecting new primitive id
Without reseting the vertex id, with primitives where the same vertex is used with different primitives (e.g. tri/lines strips) our vbuf module won't re-emit those vertices with the changed primitive id. So lets reset the vertex id whenever injecting new primitive id to make sure that the vertex data is correctly emitted. Signed-off-by: Zack Rusin <zackr@vmware.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/draw/draw_pipe_ia.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe_ia.c b/src/gallium/auxiliary/draw/draw_pipe_ia.c
index ecbb23397dc..d64f19b38cb 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_ia.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_ia.c
@@ -68,6 +68,15 @@ inject_primid(struct draw_stage *stage,
for (i = 0; i < num_verts; ++i) {
struct vertex_header *v = header->v[i];
+ /* We have to reset the vertex_id because it's used by
+ * vbuf to figure out if the vertex had already been
+ * emitted. For line/tri strips the first vertex of
+ * subsequent primitives would already be emitted,
+ * but since we're changing the primitive id on the vertex
+ * we want to make sure it's reemitted with the correct
+ * data.
+ */
+ v->vertex_id = UNDEFINED_VERTEX_ID;
memcpy(&v->data[slot][0], &primid, sizeof(primid));
memcpy(&v->data[slot][1], &primid, sizeof(primid));
memcpy(&v->data[slot][2], &primid, sizeof(primid));