KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir/spirv: Allow OpBranchConditional without a merge 

This can happen if you have a predicated break/continue.
This commit is contained in:
Jason Ekstrand 2016-01-11 17:03:50 -08:00
parent 24523e98a4
commit 1c5393d57d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/glsl/nir/spirv/vtn_cfg.c
View File

@ -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,