diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-12-18 11:28:57 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-12-23 13:49:56 -0800 |
| commit | a7f3e113ad7e9c96b9156327f8499a19aeb64068 (patch) | |
| tree | bb44529292905e0b75ec929c2adc4a6d4a133513 /src | |
| parent | ac975b73cf7d51ae8dd6a4fed8f82902a0c28919 (diff) | |
| download | external_mesa3d-a7f3e113ad7e9c96b9156327f8499a19aeb64068.zip external_mesa3d-a7f3e113ad7e9c96b9156327f8499a19aeb64068.tar.gz external_mesa3d-a7f3e113ad7e9c96b9156327f8499a19aeb64068.tar.bz2 | |
i965/nir: Remove return handling
This was added because we were getting spurrious returns coming out of
SPIR-V. Now that we're calling lower_returns, we don't need this.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_nir.cpp | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp index 6f51ce1..4e0ff50 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp @@ -2944,12 +2944,6 @@ fs_visitor::nir_emit_jump(const fs_builder &bld, nir_jump_instr *instr) bld.emit(BRW_OPCODE_CONTINUE); break; case nir_jump_return: - /* This has to be the last block in the shader. We don't handle - * early returns. - */ - assert(nir_cf_node_next(&instr->instr.block->cf_node) == NULL && - instr->instr.block->cf_node.parent->type == nir_cf_node_function); - break; default: unreachable("unknown jump"); } diff --git a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp index cfb66a5..dcecd77 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp @@ -1482,13 +1482,6 @@ vec4_visitor::nir_emit_jump(nir_jump_instr *instr) break; case nir_jump_return: - /* This has to be the last block in the shader. We don't handle - * early returns. - */ - assert(nir_cf_node_next(&instr->instr.block->cf_node) == NULL && - instr->instr.block->cf_node.parent->type == nir_cf_node_function); - break; - default: unreachable("unknown jump"); } |