From 6bf6bdbc2bbc14875fff725aad9b7ed6ccfeff64 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 7 Dec 2015 05:44:02 +0000 Subject: [PATCH] r600: fix regression introduced with ring emit changes. This was adding one after a CUT which broke end primitive --- src/gallium/drivers/r600/r600_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 00fbef64909..fd3cb3edd21 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -8839,7 +8839,8 @@ static int tgsi_gs_emit(struct r600_shader_ctx *ctx) r = r600_bytecode_add_cfinst(ctx->bc, ctx->inst_info->op); if (!r) { ctx->bc->cf_last->count = stream; // Count field for CUT/EMIT_VERTEX indicates which stream - return emit_inc_ring_offset(ctx, stream, TRUE); + if (ctx->inst_info->op == CF_OP_EMIT_VERTEX) + return emit_inc_ring_offset(ctx, stream, TRUE); } return r; } -- 2.30.2