OSDN Git Service

spirv: Fix reaching unreachable for compare exchange on images
authorJames Legg <jlegg@feralinteractive.com>
Mon, 26 Jun 2017 09:46:23 +0000 (10:46 +0100)
committerAndres Gomez <agomez@igalia.com>
Wed, 12 Jul 2017 16:32:10 +0000 (19:32 +0300)
We were hitting the
unreachable("Invalid image opcode")
near the end of vtn_handle_image when parsing the
SpvOpAtomicCompareExchange opcode.

v2: Add stable CC.
v3: Ignore SpvOpAtomicCompareExchangeWeak. It requires the Kernel
capability which is not exposed in Vulkan, and spirv_to_nir is not used
for OpenCL which does support it.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
CC: <mesa-stable@lists.freedesktop.org>
(cherry picked from commit b117f59710e62f4afa5781c554f8113e2b0df9cc)

src/compiler/spirv/spirv_to_nir.c

index 1398184..2a13636 100644 (file)
@@ -1977,6 +1977,7 @@ vtn_handle_image(struct vtn_builder *b, SpvOp opcode,
       intrin->src[2] = nir_src_for_ssa(vtn_ssa_value(b, w[3])->def);
       break;
 
+   case SpvOpAtomicCompareExchange:
    case SpvOpAtomicIIncrement:
    case SpvOpAtomicIDecrement:
    case SpvOpAtomicExchange: