Module: Mesa Branch: master Commit: d05c35914df1c382b90def7e7425d7f2fa4737dc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d05c35914df1c382b90def7e7425d7f2fa4737dc
Author: Eric Anholt <[email protected]> Date: Wed Apr 28 12:47:51 2010 -0700 i965: Implement VS MAX in a more obvious way. This should be functionally equivalent, with the possible exception of NaN handling. --- src/mesa/drivers/dri/i965/brw_vs_emit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vs_emit.c b/src/mesa/drivers/dri/i965/brw_vs_emit.c index e83c9bf..dc6ab81 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_emit.c +++ b/src/mesa/drivers/dri/i965/brw_vs_emit.c @@ -49,7 +49,7 @@ brw_vs_arg_can_be_immediate(enum prog_opcode opcode, int arg) [OPCODE_DP3] = 2, [OPCODE_DP4] = 2, [OPCODE_DPH] = 2, - [OPCODE_MAX] = 1, + [OPCODE_MAX] = 2, [OPCODE_MIN] = 2, [OPCODE_MUL] = 2, [OPCODE_SEQ] = 2, @@ -490,8 +490,8 @@ static void emit_max( struct brw_compile *p, struct brw_reg arg0, struct brw_reg arg1 ) { - brw_CMP(p, brw_null_reg(), BRW_CONDITIONAL_L, arg0, arg1); - brw_SEL(p, dst, arg1, arg0); + brw_CMP(p, brw_null_reg(), BRW_CONDITIONAL_GE, arg0, arg1); + brw_SEL(p, dst, arg0, arg1); brw_set_predicate_control(p, BRW_PREDICATE_NONE); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
