OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe220eb
)
nir/spirv: Don't assert that the current block is empty
author
Jason Ekstrand
<jason.ekstrand@intel.com>
Sat, 16 May 2015 19:34:32 +0000
(12:34 -0700)
committer
Jason Ekstrand
<jason.ekstrand@intel.com>
Mon, 31 Aug 2015 23:58:20 +0000
(16:58 -0700)
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
patch
|
blob
|
history
diff --git
a/src/glsl/nir/spirv_to_nir.c
b/src/glsl/nir/spirv_to_nir.c
index
a0404df
..
3f2ef15
100644
(file)
--- 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;
}