diff options
author | Jason Ekstrand <[email protected]> | 2014-12-12 20:37:04 -0800 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2015-01-15 07:20:21 -0800 |
commit | b3fd098e7daa491637d66d03366b67c989937a1f (patch) | |
tree | 000f2453d4fe1d914008a484811c1c672589d3c8 /src/glsl/nir | |
parent | 295faf9462cba88250d8581f65611996eba5e389 (diff) |
nir: Make bcsel a fully vector operation
Previously, the condition was a scalar that applied to all components
simultaneously. As of this commit, the condition is a vector and each
component is switched seperately.
Reviewed-by: Connor Abbott <[email protected]>
Diffstat (limited to 'src/glsl/nir')
-rw-r--r-- | src/glsl/nir/nir_lower_variables.c | 1 | ||||
-rw-r--r-- | src/glsl/nir/nir_opcodes.h | 5 | ||||
-rw-r--r-- | src/glsl/nir/nir_opt_peephole_select.c | 2 | ||||
-rw-r--r-- | src/glsl/nir/nir_to_ssa.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/glsl/nir/nir_lower_variables.c b/src/glsl/nir/nir_lower_variables.c index b8961f85ce8..64682056ddc 100644 --- a/src/glsl/nir/nir_lower_variables.c +++ b/src/glsl/nir/nir_lower_variables.c @@ -836,6 +836,7 @@ lower_deref_to_ssa_block(nir_block *block, void *void_state) mov = nir_alu_instr_create(state->mem_ctx, nir_op_bcsel); mov->src[0].src = nir_src_copy(intrin->predicate, state->mem_ctx); + /* Splat the condition to all channels */ memset(mov->src[0].swizzle, 0, sizeof mov->src[0].swizzle); mov->src[1].src.is_ssa = true; diff --git a/src/glsl/nir/nir_opcodes.h b/src/glsl/nir/nir_opcodes.h index c8230b32df0..310c9d83b7c 100644 --- a/src/glsl/nir/nir_opcodes.h +++ b/src/glsl/nir/nir_opcodes.h @@ -325,9 +325,8 @@ TRIOP(flrp, nir_type_float) * bools (0.0 vs 1.0) and one for integer bools (0 vs ~0). */ -OPCODE(fcsel, 3, true, 0, nir_type_float, ARR(1, 0, 0), - ARR(nir_type_float, nir_type_float, nir_type_float)) -OPCODE(bcsel, 3, true, 0, nir_type_unsigned, ARR(1, 0, 0), +TRIOP(fcsel, nir_type_float) +OPCODE(bcsel, 3, true, 0, nir_type_unsigned, ARR(0, 0, 0), ARR(nir_type_bool, nir_type_unsigned, nir_type_unsigned)) TRIOP(bfi, nir_type_unsigned) diff --git a/src/glsl/nir/nir_opt_peephole_select.c b/src/glsl/nir/nir_opt_peephole_select.c index 247fe050a70..3e8c93882d2 100644 --- a/src/glsl/nir/nir_opt_peephole_select.c +++ b/src/glsl/nir/nir_opt_peephole_select.c @@ -136,6 +136,8 @@ nir_opt_peephole_select_block(nir_block *block, void *void_state) nir_phi_instr *phi = nir_instr_as_phi(instr); nir_alu_instr *sel = nir_alu_instr_create(state->mem_ctx, nir_op_bcsel); sel->src[0].src = nir_src_copy(if_stmt->condition, state->mem_ctx); + /* Splat the condition to all channels */ + memset(sel->src[0].swizzle, 0, sizeof sel->src[0].swizzle); assert(exec_list_length(&phi->srcs) == 2); foreach_list_typed(nir_phi_src, src, node, &phi->srcs) { diff --git a/src/glsl/nir/nir_to_ssa.c b/src/glsl/nir/nir_to_ssa.c index 7fdae493887..6b6a0779a6d 100644 --- a/src/glsl/nir/nir_to_ssa.c +++ b/src/glsl/nir/nir_to_ssa.c @@ -235,6 +235,8 @@ rewrite_def_forwards(nir_dest *dest, void *_state) csel->dest.dest.reg.reg = dest->reg.reg; csel->dest.write_mask = (1 << dest->reg.reg->num_components) - 1; csel->src[0].src = nir_src_copy(*state->predicate, state->mem_ctx); + /* Splat the condition to all channels */ + memset(csel->src[0].swizzle, 0, sizeof csel->src[0].swizzle); csel->src[2].src.is_ssa = true; csel->src[2].src.ssa = get_ssa_src(dest->reg.reg, state); } |