From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 12 Jan 2016 01:03:50 +0000 (-0800)
Subject: nir/spirv: Allow OpBranchConditional without a merge
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1c5393d57d46e20612cee6c567421da10e0fcd48;p=mesa.git

nir/spirv: Allow OpBranchConditional without a merge

This can happen if you have a predicated break/continue.
---

diff --git a/src/glsl/nir/spirv/vtn_cfg.c b/src/glsl/nir/spirv/vtn_cfg.c
index a927fb728c1..b3061ce47bb 100644
--- a/src/glsl/nir/spirv/vtn_cfg.c
+++ b/src/glsl/nir/spirv/vtn_cfg.c
@@ -325,12 +325,10 @@ vtn_cfg_walk_blocks(struct vtn_builder *b, struct list_head *cf_list,
 
          list_addtail(&if_stmt->node.link, cf_list);
 
-         /* OpBranchConditional must be at the end of a block with either
-          * an OpSelectionMerge or an OpLoopMerge.
-          */
-         assert(block->merge);
-         if ((*block->merge & SpvOpCodeMask) == SpvOpSelectionMerge)
+         if (block->merge &&
+             (*block->merge & SpvOpCodeMask) == SpvOpSelectionMerge) {
             if_stmt->control = block->merge[2];
+         }
 
          if_stmt->then_type = vtn_get_branch_type(then_block,
                                                   switch_case, switch_break,