diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_reg.h | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 8 |
3 files changed, 15 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 9f65b1f4cd0..89ac7e28828 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -636,7 +636,8 @@ fs_visitor::visit(ir_expression *ir) if (brw->gen >= 7) no16("SIMD16 explicit accumulator operands unsupported\n"); - struct brw_reg acc = retype(brw_acc_reg(), this->result.type); + struct brw_reg acc = retype(brw_acc_reg(dispatch_width), + this->result.type); emit(MUL(acc, op[0], op[1])); emit(MACH(reg_null_d, op[0], op[1])); @@ -650,7 +651,8 @@ fs_visitor::visit(ir_expression *ir) if (brw->gen >= 7) no16("SIMD16 explicit accumulator operands unsupported\n"); - struct brw_reg acc = retype(brw_acc_reg(), this->result.type); + struct brw_reg acc = retype(brw_acc_reg(dispatch_width), + this->result.type); emit(MUL(acc, op[0], op[1])); emit(MACH(this->result, op[0], op[1])); @@ -665,7 +667,8 @@ fs_visitor::visit(ir_expression *ir) if (brw->gen >= 7) no16("SIMD16 explicit accumulator operands unsupported\n"); - struct brw_reg acc = retype(brw_acc_reg(), BRW_REGISTER_TYPE_UD); + struct brw_reg acc = retype(brw_acc_reg(dispatch_width), + BRW_REGISTER_TYPE_UD); emit(ADDC(reg_null_ud, op[0], op[1])); emit(MOV(this->result, fs_reg(acc))); @@ -675,7 +678,8 @@ fs_visitor::visit(ir_expression *ir) if (brw->gen >= 7) no16("SIMD16 explicit accumulator operands unsupported\n"); - struct brw_reg acc = retype(brw_acc_reg(), BRW_REGISTER_TYPE_UD); + struct brw_reg acc = retype(brw_acc_reg(dispatch_width), + BRW_REGISTER_TYPE_UD); emit(SUBB(reg_null_ud, op[0], op[1])); emit(MOV(this->result, fs_reg(acc))); diff --git a/src/mesa/drivers/dri/i965/brw_reg.h b/src/mesa/drivers/dri/i965/brw_reg.h index 2e110d6b90d..19af0ae09fc 100644 --- a/src/mesa/drivers/dri/i965/brw_reg.h +++ b/src/mesa/drivers/dri/i965/brw_reg.h @@ -639,9 +639,10 @@ brw_ip_reg(void) } static inline struct brw_reg -brw_acc_reg(void) +brw_acc_reg(unsigned width) { - return brw_vec8_reg(BRW_ARCHITECTURE_REGISTER_FILE, BRW_ARF_ACCUMULATOR, 0); + return brw_vecn_reg(width, BRW_ARCHITECTURE_REGISTER_FILE, + BRW_ARF_ACCUMULATOR, 0); } static inline struct brw_reg diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 92990290eb4..f03cf4f1f67 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -1455,7 +1455,7 @@ vec4_visitor::visit(ir_expression *ir) else emit(MUL(result_dst, op[0], op[1])); } else { - struct brw_reg acc = retype(brw_acc_reg(), result_dst.type); + struct brw_reg acc = retype(brw_acc_reg(8), result_dst.type); emit(MUL(acc, op[0], op[1])); emit(MACH(dst_null_d(), op[0], op[1])); @@ -1466,7 +1466,7 @@ vec4_visitor::visit(ir_expression *ir) } break; case ir_binop_imul_high: { - struct brw_reg acc = retype(brw_acc_reg(), result_dst.type); + struct brw_reg acc = retype(brw_acc_reg(8), result_dst.type); emit(MUL(acc, op[0], op[1])); emit(MACH(result_dst, op[0], op[1])); @@ -1478,14 +1478,14 @@ vec4_visitor::visit(ir_expression *ir) emit_math(SHADER_OPCODE_INT_QUOTIENT, result_dst, op[0], op[1]); break; case ir_binop_carry: { - struct brw_reg acc = retype(brw_acc_reg(), BRW_REGISTER_TYPE_UD); + struct brw_reg acc = retype(brw_acc_reg(8), BRW_REGISTER_TYPE_UD); emit(ADDC(dst_null_ud(), op[0], op[1])); emit(MOV(result_dst, src_reg(acc))); break; } case ir_binop_borrow: { - struct brw_reg acc = retype(brw_acc_reg(), BRW_REGISTER_TYPE_UD); + struct brw_reg acc = retype(brw_acc_reg(8), BRW_REGISTER_TYPE_UD); emit(SUBB(dst_null_ud(), op[0], op[1])); emit(MOV(result_dst, src_reg(acc))); |