<div dir="ltr"><div class="gmail_quote"><div dir="ltr">On Fri, Jul 20, 2018 at 8:09 AM Alejandro Piñeiro <<a href="mailto:apinheiro@igalia.com">apinheiro@igalia.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Neil Roberts <<a href="mailto:nroberts@igalia.com" target="_blank">nroberts@igalia.com</a>><br>
<br>
It looks like it was previously taking the SPIR-V instruction number<br>
directly instead of looking up the constant value.<br>
---<br>
src/compiler/spirv/spirv_to_nir.c | 9 +++++++--<br>
1 file changed, 7 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c<br>
index 4d297e60b60..2fef6b0bf15 100644<br>
--- a/src/compiler/spirv/spirv_to_nir.c<br>
+++ b/src/compiler/spirv/spirv_to_nir.c<br>
@@ -3219,9 +3219,14 @@ vtn_handle_barrier(struct vtn_builder *b, SpvOp opcode,<br>
<br>
switch (opcode) {<br>
case SpvOpEmitStreamVertex:<br>
- case SpvOpEndStreamPrimitive:<br>
- nir_intrinsic_set_stream_id(intrin, w[1]);<br>
+ case SpvOpEndStreamPrimitive: {<br>
+ struct vtn_value *stream_value =<br>
+ vtn_value(b, w[1], vtn_value_type_constant);<br>
+ unsigned stream = stream_value->constant->values[0].u32[0];<br></blockquote><div><br></div><div>There's a vtn_constant_value helper now which would make this a bit shorter. It may not have existed when Neil first drafted this patch. With that update,</div><div><br></div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ nir_intrinsic_set_stream_id(intrin, stream);<br>
break;<br>
+ }<br>
+<br>
default:<br>
break;<br>
}<br>
-- <br>
2.14.1<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">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/mailman/listinfo/mesa-dev</a><br>
</blockquote></div></div>