OSDN Git Service

spirv: fix visiting inner loops with same break/continue block
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Tue, 15 May 2018 10:00:30 +0000 (12:00 +0200)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Tue, 15 May 2018 19:38:19 +0000 (21:38 +0200)
commit6bde8c560877512852ff49fafa296eb71a5ec14b
tree5e5928172ee9d13892bfbf7fc770dc97661e7f0e
parentd89f58a6b8436b59dcf3b896c0ccddabed3f78fd
spirv: fix visiting inner loops with same break/continue block

We should stop walking through the CFG when the inner loop's
break block ends up as the same block as the outer loop's
continue block because we are already going to visit it.

This fixes the following assertion which ends up by crashing
in RADV or ANV:

SPIR-V parsing FAILED:
In file ../src/compiler/spirv/vtn_cfg.c:381
block->node.link.next == NULL
0 bytes into the SPIR-V binary

This also fixes a crash with a camera shader from SteamVR.

v2: make use of vtn_get_branch_type() and add an assertion

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106090
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106504
CC: 18.0 18.1 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
src/compiler/spirv/vtn_cfg.c