From 7c29588c07500aabbd6cc494ee220ebd2abdff74 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 8 Aug 2019 08:16:09 -0700 Subject: [PATCH] panfrost: Increment offsets[] per draw We have to maintain the internal offset ourselves. Per v3d. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Boris Brezillon --- src/gallium/drivers/panfrost/pan_context.c | 10 ++++++++++ src/gallium/drivers/panfrost/pan_context.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c index e023144b9c8..8177f8917f3 100644 --- a/src/gallium/drivers/panfrost/pan_context.c +++ b/src/gallium/drivers/panfrost/pan_context.c @@ -1640,6 +1640,7 @@ panfrost_draw_vbo( /* Take into account a negative bias */ ctx->vertex_count = info->count + abs(info->index_bias); ctx->instance_count = info->instance_count; + ctx->active_prim = info->mode; /* For non-indexed draws, they're the same */ unsigned vertex_count = ctx->vertex_count; @@ -1754,6 +1755,15 @@ panfrost_draw_vbo( /* Fire off the draw itself */ panfrost_queue_draw(ctx); + + /* Increment transform feedback offsets */ + + for (unsigned i = 0; i < ctx->streamout.num_targets; ++i) { + unsigned output_count = u_stream_outputs_for_vertices( + ctx->active_prim, ctx->vertex_count); + + ctx->streamout.offsets[i] += output_count; + } } /* CSO state */ diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h index ba27ced9074..e4dfe21bfd3 100644 --- a/src/gallium/drivers/panfrost/pan_context.h +++ b/src/gallium/drivers/panfrost/pan_context.h @@ -150,6 +150,7 @@ struct panfrost_context { unsigned vertex_count; unsigned instance_count; + enum pipe_prim_type active_prim; /* If instancing is enabled, vertex count padded for instance; if * it is disabled, just equal to plain vertex count */ -- 2.30.2