<div dir="auto"><div><br><div class="gmail_extra"><br><div class="gmail_quote">On Jan 19, 2018 1:28 AM, "Timothy Arceri" <<a href="mailto:tarceri@itsqueeze.com">tarceri@itsqueeze.com</a>> wrote:<br type="attribution"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Fixes the following piglit test on radeonsi:<br>
<br>
./bin/arb_enhanced_layouts-gs-<wbr>stream-location-aliasing<br>
---<br>
src/amd/common/ac_nir_to_llvm.<wbr>c | 5 +++--<br>
1 file changed, 3 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/amd/common/ac_nir_to_<wbr>llvm.c b/src/amd/common/ac_nir_to_<wbr>llvm.c<br>
index e88f64fb3b..a204182792 100644<br>
--- a/src/amd/common/ac_nir_to_<wbr>llvm.c<br>
+++ b/src/amd/common/ac_nir_to_<wbr>llvm.c<br>
@@ -4159,6 +4159,8 @@ visit_emit_vertex(struct ac_shader_abi *abi, unsigned stream, LLVMValueRef *addr<br>
int idx;<br>
struct nir_to_llvm_context *ctx = nir_to_llvm_context_from_abi(<wbr>abi);<br>
<br>
+ assert(stream == 0);<br>
+<br>
/* Write vertex attribute values to GSVS ring */<br>
gs_next_vertex = LLVMBuildLoad(ctx->builder,<br>
ctx->gs_next_vertex,<br>
@@ -4428,8 +4430,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx,<br>
result = visit_interp(ctx, instr);<br>
break;<br>
case nir_intrinsic_emit_vertex:<br>
- assert(instr->const_index[0] == 0);<br>
- ctx->abi->emit_vertex(ctx-><wbr>abi, 0, ctx->outputs);<br>
+ ctx->abi->emit_vertex(ctx-><wbr>abi, instr->const_index[0], ctx->outputs);<br></blockquote></div></div></div><div dir="auto"><br></div><div dir="auto">Wouldn't it make sense to use the same helper as end primitive uses below?</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_extra"><div class="gmail_quote"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
break;<br>
case nir_intrinsic_end_primitive:<br>
ctx->abi->emit_primitive(ctx-><wbr>abi, nir_intrinsic_stream_id(instr)<wbr>);<br>
<font color="#888888">--<br>
2.14.3<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></blockquote></div><br></div></div></div>