<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">OpAtomicCompareExchangeWeak is only available in OpenCL, not Vulkan. As such, we probably don't want to handle it yet as no one uses spirv_to_nir for OpenCL. The assert on AtomicCompareExchange is, however, a bug we should fix now.<br><br></div><div class="gmail_quote">--Jason<br></div><div class="gmail_quote"><br>On Wed, Jun 21, 2017 at 8:59 AM, James Legg <span dir="ltr"><<a href="mailto:jlegg@feralinteractive.com" target="_blank">jlegg@feralinteractive.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">We were hitting the<br>
unreachable("Invalid image opcode")<br>
near the end of vtn_handle_image when parsing SpvOpAtomicCompareExchange<br>
and SpvOpAtomicCompareExchangeWeak opcodes.<br>
---<br>
src/compiler/spirv/spirv_to_<wbr>nir.c | 3 +++<br>
1 file changed, 3 insertions(+)<br>
<br>
diff --git a/src/compiler/spirv/spirv_to_<wbr>nir.c b/src/compiler/spirv/spirv_to_<wbr>nir.c<br>
index 0a5eb0e..8f21aec 100644<br>
--- a/src/compiler/spirv/spirv_to_<wbr>nir.c<br>
+++ b/src/compiler/spirv/spirv_to_<wbr>nir.c<br>
@@ -1805,6 +1805,7 @@ fill_common_atomic_sources(<wbr>struct vtn_builder *b, SpvOp opcode,<br>
break;<br>
<br>
case SpvOpAtomicCompareExchange:<br>
+ case SpvOpAtomicCompareExchangeWeak<wbr>:<br>
src[0] = nir_src_for_ssa(vtn_ssa_value(<wbr>b, w[8])->def);<br>
src[1] = nir_src_for_ssa(vtn_ssa_value(<wbr>b, w[7])->def);<br>
break;<br>
@@ -1977,6 +1978,8 @@ vtn_handle_image(struct vtn_builder *b, SpvOp opcode,<br>
intrin->src[2] = nir_src_for_ssa(vtn_ssa_value(<wbr>b, w[3])->def);<br>
break;<br>
<br>
+ case SpvOpAtomicCompareExchange:<br>
+ case SpvOpAtomicCompareExchangeWeak<wbr>:<br>
case SpvOpAtomicIIncrement:<br>
case SpvOpAtomicIDecrement:<br>
case SpvOpAtomicExchange:<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.9.4<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></span></blockquote></div><br></div></div>