From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Thu, 18 Jan 2018 21:33:03 +0000 (+1100)
Subject: ac: add stream handling to visit_end_primitive()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fdc2fb4d88377213991c70dbcfafb70004912515;p=mesa.git

ac: add stream handling to visit_end_primitive()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 82f29c05880..76edb8d06a3 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -4207,10 +4207,9 @@ visit_emit_vertex(struct ac_shader_abi *abi, unsigned stream, LLVMValueRef *addr
 }
 
 static void
-visit_end_primitive(struct nir_to_llvm_context *ctx,
-		    const nir_intrinsic_instr *instr)
+visit_end_primitive(struct nir_to_llvm_context *ctx, unsigned stream)
 {
-	ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_CUT | AC_SENDMSG_GS | (0 << 8), ctx->gs_wave_id);
+	ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_CUT | AC_SENDMSG_GS | (stream << 8), ctx->gs_wave_id);
 }
 
 static LLVMValueRef
@@ -4458,7 +4457,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx,
 		ctx->abi->emit_vertex(ctx->abi, 0, ctx->outputs);
 		break;
 	case nir_intrinsic_end_primitive:
-		visit_end_primitive(ctx->nctx, instr);
+		visit_end_primitive(ctx->nctx, nir_intrinsic_stream_id(instr));
 		break;
 	case nir_intrinsic_load_tess_coord: {
 		LLVMTypeRef type = ctx->nctx ?