summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2015-03-17 13:43:10 -0700
committerJason Ekstrand <[email protected]>2015-03-23 01:01:14 -0700
commit2612e569e04e29500f81ed233bd86b45ef583495 (patch)
tree2abfd98ebb418be52d67a12001742db7bb9f0485 /src/mesa/drivers
parent80390f91a0e200ae29a678bda495b91f6452023a (diff)
i965/nir: Properly set the predicate on the SEL used in min/max
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_nir.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index a059dbb6a56..90071f602bb 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -1136,6 +1136,7 @@ fs_visitor::nir_emit_alu(nir_alu_instr *instr)
} else {
emit(CMP(reg_null_d, op[0], op[1], BRW_CONDITIONAL_L));
inst = emit(SEL(result, op[0], op[1]));
+ inst->predicate = BRW_PREDICATE_NORMAL;
}
inst->saturate = instr->dest.saturate;
break;
@@ -1149,6 +1150,7 @@ fs_visitor::nir_emit_alu(nir_alu_instr *instr)
} else {
emit(CMP(reg_null_d, op[0], op[1], BRW_CONDITIONAL_GE));
inst = emit(SEL(result, op[0], op[1]));
+ inst->predicate = BRW_PREDICATE_NORMAL;
}
inst->saturate = instr->dest.saturate;
break;