From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Fri, 19 Jan 2018 05:30:37 +0000 (+1100)
Subject: ac: fix emit vertex stream parameter
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=324d2fe6a754e84df79db75cdbc3a8c4c32a7279;p=mesa.git

ac: fix emit vertex stream parameter

Fixes the following piglit test on radeonsi:

./bin/arb_enhanced_layouts-gs-stream-location-aliasing

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 b90c31320c0..53f5782eac5 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -4162,6 +4162,8 @@ visit_emit_vertex(struct ac_shader_abi *abi, unsigned stream, LLVMValueRef *addr
 	int idx;
 	struct nir_to_llvm_context *ctx = nir_to_llvm_context_from_abi(abi);
 
+	assert(stream == 0);
+
 	/* Write vertex attribute values to GSVS ring */
 	gs_next_vertex = LLVMBuildLoad(ctx->builder,
 				       ctx->gs_next_vertex,
@@ -4468,8 +4470,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx,
 		result = visit_interp(ctx->nctx, instr);
 		break;
 	case nir_intrinsic_emit_vertex:
-		assert(instr->const_index[0] == 0);
-		ctx->abi->emit_vertex(ctx->abi, 0, ctx->outputs);
+		ctx->abi->emit_vertex(ctx->abi, nir_intrinsic_stream_id(instr), ctx->outputs);
 		break;
 	case nir_intrinsic_end_primitive:
 		ctx->abi->emit_primitive(ctx->abi, nir_intrinsic_stream_id(instr));