i965/vs: Implement integer quotient and remainder math operations.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke 2011-09-28 17:37:55 -07:00
parent ff8f272b0d
commit 1d4f3ca8f0
3 changed files with 24 additions and 4 deletions

View file

@ -41,6 +41,8 @@ vec4_instruction::is_math()
opcode == SHADER_OPCODE_LOG2 ||
opcode == SHADER_OPCODE_SIN ||
opcode == SHADER_OPCODE_COS ||
opcode == SHADER_OPCODE_INT_QUOTIENT ||
opcode == SHADER_OPCODE_INT_REMAINDER ||
opcode == SHADER_OPCODE_POW);
}
/**

View file

@ -307,7 +307,7 @@ vec4_visitor::generate_math2_gen4(vec4_instruction *inst,
struct brw_reg src0,
struct brw_reg src1)
{
brw_MOV(p, brw_message_reg(inst->base_mrf + 1), src1);
brw_MOV(p, retype(brw_message_reg(inst->base_mrf + 1), src1.type), src1);
brw_math(p,
dst,
@ -544,6 +544,8 @@ vec4_visitor::generate_vs_instruction(vec4_instruction *instruction,
break;
case SHADER_OPCODE_POW:
case SHADER_OPCODE_INT_QUOTIENT:
case SHADER_OPCODE_INT_REMAINDER:
if (intel->gen >= 6) {
generate_math2_gen6(inst, dst, src[0], src[1]);
} else {

View file

@ -326,10 +326,12 @@ vec4_visitor::emit_math2_gen6(enum opcode opcode,
*/
expanded = src_reg(this, glsl_type::vec4_type);
expanded.type = src0.type;
emit(MOV(dst_reg(expanded), src0));
src0 = expanded;
expanded = src_reg(this, glsl_type::vec4_type);
expanded.type = src1.type;
emit(MOV(dst_reg(expanded), src1));
src1 = expanded;
@ -338,6 +340,7 @@ vec4_visitor::emit_math2_gen6(enum opcode opcode,
* writemasks.
*/
dst_reg temp_dst = dst_reg(this, glsl_type::vec4_type);
temp_dst.type = dst.type;
emit(opcode, temp_dst, src0, src1);
@ -360,7 +363,15 @@ void
vec4_visitor::emit_math(enum opcode opcode,
dst_reg dst, src_reg src0, src_reg src1)
{
assert(opcode == SHADER_OPCODE_POW);
switch (opcode) {
case SHADER_OPCODE_POW:
case SHADER_OPCODE_INT_QUOTIENT:
case SHADER_OPCODE_INT_REMAINDER:
break;
default:
assert(!"not reached: unsupported binary math opcode");
return;
}
if (intel->gen >= 6) {
return emit_math2_gen6(opcode, dst, src0, src1);
@ -1112,9 +1123,14 @@ vec4_visitor::visit(ir_expression *ir)
}
break;
case ir_binop_div:
assert(!"not reached: should be handled by ir_div_to_mul_rcp");
/* Floating point should be lowered by DIV_TO_MUL_RCP in the compiler. */
assert(ir->type->is_integer());
emit_math(SHADER_OPCODE_INT_QUOTIENT, result_dst, op[0], op[1]);
break;
case ir_binop_mod:
assert(!"ir_binop_mod should have been converted to b * fract(a/b)");
/* Floating point should be lowered by MOD_TO_FRACT in the compiler. */
assert(ir->type->is_integer());
emit_math(SHADER_OPCODE_INT_REMAINDER, result_dst, op[0], op[1]);
break;
case ir_binop_less: