summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600/r600_shader.c
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2015-12-07 05:44:02 +0000
committerDave Airlie <[email protected]>2015-12-07 05:44:55 +0000
commit6bf6bdbc2bbc14875fff725aad9b7ed6ccfeff64 (patch)
treed6d60128e13ae05e94ddd7bc2a32f222ed8c39c7 /src/gallium/drivers/r600/r600_shader.c
parentfc276bda22d1beb4c850a8ba0728b1e43ced595b (diff)
r600: fix regression introduced with ring emit changes.
This was adding one after a CUT which broke end primitive
Diffstat (limited to 'src/gallium/drivers/r600/r600_shader.c')
-rw-r--r--src/gallium/drivers/r600/r600_shader.c3
1 files changed, 2 insertions, 1 deletions
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;
}