Mesa (master): i965/nir: Properly set the predicate on the SEL used in min /max

Jason Ekstrand jekstrand at kemper.freedesktop.org
Mon Mar 23 08:04:31 UTC 2015


Module: Mesa
Branch: master
Commit: 2612e569e04e29500f81ed233bd86b45ef583495
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2612e569e04e29500f81ed233bd86b45ef583495

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Mar 17 13:43:10 2015 -0700

i965/nir: Properly set the predicate on the SEL used in min/max

Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/dri/i965/brw_fs_nir.cpp |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index a059dbb..90071f6 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;




More information about the mesa-commit mailing list