From: Kenneth Graunke Date: Fri, 11 Jan 2013 22:19:56 +0000 (-0800) Subject: i965/fs: Don't mix integer/float immediates in i2b handling. X-Git-Tag: mesa-9.1-rc1~406 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fea648db08114e0e10c164e2d6507b71bd22f63a;p=platform%2Fupstream%2Fmesa.git i965/fs: Don't mix integer/float immediates in i2b handling. The simulator gets very angry about our i2b code: cmp.ne(16) g3<1>D g2<0,1,0>D 0F We can't mix integer DWord and float types. The only reason to use 0F here was to share code with f2b. Split it and use 0D instead. While we don't believe anything bad will actually happen because of this, it's nice to fix the warnings and easy enough to do. Reviewed-by: Paul Berry Reviewed-by: Eric Anholt --- diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index e70d6bf..5885989 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -506,9 +506,11 @@ fs_visitor::visit(ir_expression *ir) break; case ir_unop_f2b: - case ir_unop_i2b: emit(CMP(this->result, op[0], fs_reg(0.0f), BRW_CONDITIONAL_NZ)); break; + case ir_unop_i2b: + emit(CMP(this->result, op[0], fs_reg(0), BRW_CONDITIONAL_NZ)); + break; case ir_unop_trunc: emit(RNDZ(this->result, op[0]));