From b3e29a20225756c8db299088e0b6ead82139cabb Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 24 Apr 2015 11:28:03 -0700 Subject: [PATCH] Revert "i965/fs: Allow SIMD16 borrow/carry/64-bit multiply on Gen > 7." This reverts commit 9f5e5bd34d8ba48c851b442fb88f742b1ba6a571. I have no idea what made me believe these didn't apply to Gen > 7. They do, and without them we generate bad code that causes failures on Gen 8. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 11f38c2..cf59570 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -892,7 +892,7 @@ fs_visitor::visit(ir_expression *ir) } break; case ir_binop_imul_high: { - if (devinfo->gen == 7) + if (devinfo->gen >= 7) no16("SIMD16 explicit accumulator operands unsupported\n"); struct brw_reg acc = retype(brw_acc_reg(dispatch_width), @@ -929,7 +929,7 @@ fs_visitor::visit(ir_expression *ir) emit_math(SHADER_OPCODE_INT_QUOTIENT, this->result, op[0], op[1]); break; case ir_binop_carry: { - if (devinfo->gen == 7) + if (devinfo->gen >= 7) no16("SIMD16 explicit accumulator operands unsupported\n"); struct brw_reg acc = retype(brw_acc_reg(dispatch_width), @@ -940,7 +940,7 @@ fs_visitor::visit(ir_expression *ir) break; } case ir_binop_borrow: { - if (devinfo->gen == 7) + if (devinfo->gen >= 7) no16("SIMD16 explicit accumulator operands unsupported\n"); struct brw_reg acc = retype(brw_acc_reg(dispatch_width), -- 2.7.4