From: Dave Airlie <airlied@redhat.com>
Date: Mon, 7 Dec 2015 05:44:02 +0000 (+0000)
Subject: r600: fix regression introduced with ring emit changes.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6bf6bdbc2bbc14875fff725aad9b7ed6ccfeff64;p=mesa.git

r600: fix regression introduced with ring emit changes.

This was adding one after a CUT which broke end primitive
---

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;
 }