From 756b00389c4034331989299d0dd3505da02dfa78 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sat, 16 May 2015 12:34:32 -0700 Subject: [PATCH] nir/spirv: Don't assert that the current block is empty It's possible that someone will give us SPIR-V code in which someone needlessly branches to new blocks. We should handle that ok now. --- src/glsl/nir/spirv_to_nir.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/glsl/nir/spirv_to_nir.c b/src/glsl/nir/spirv_to_nir.c index a0404dfd057..3f2ef15c74f 100644 --- a/src/glsl/nir/spirv_to_nir.c +++ b/src/glsl/nir/spirv_to_nir.c @@ -1186,8 +1186,6 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode, nir_cf_node *tail_node = exec_node_data(nir_cf_node, list_tail, node); assert(tail_node->type == nir_cf_node_block); block->block = nir_cf_node_as_block(tail_node); - - assert(exec_list_is_empty(&block->block->instr_list)); break; } -- 2.30.2