diff options
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.cpp | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 22cd77deea5..c46e1d73fd4 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -2343,6 +2343,14 @@ fs_visitor::opt_algebraic() break; } + if (inst->src[0].file == IMM) { + assert(inst->src[0].type == BRW_REGISTER_TYPE_F); + inst->opcode = BRW_OPCODE_MOV; + inst->src[0].fixed_hw_reg.dw1.f *= inst->src[1].fixed_hw_reg.dw1.f; + inst->src[1] = reg_undef; + progress = true; + break; + } break; case BRW_OPCODE_ADD: if (inst->src[1].file != IMM) @@ -2355,6 +2363,15 @@ fs_visitor::opt_algebraic() progress = true; break; } + + if (inst->src[0].file == IMM) { + assert(inst->src[0].type == BRW_REGISTER_TYPE_F); + inst->opcode = BRW_OPCODE_MOV; + inst->src[0].fixed_hw_reg.dw1.f += inst->src[1].fixed_hw_reg.dw1.f; + inst->src[1] = reg_undef; + progress = true; + break; + } break; case BRW_OPCODE_OR: if (inst->src[0].equals(inst->src[1])) { @@ -2429,6 +2446,32 @@ fs_visitor::opt_algebraic() } } break; + case BRW_OPCODE_MAD: + if (inst->src[1].is_zero() || inst->src[2].is_zero()) { + inst->opcode = BRW_OPCODE_MOV; + inst->src[1] = reg_undef; + inst->src[2] = reg_undef; + progress = true; + } else if (inst->src[0].is_zero()) { + inst->opcode = BRW_OPCODE_MUL; + inst->src[0] = inst->src[2]; + inst->src[2] = reg_undef; + } else if (inst->src[1].is_one()) { + inst->opcode = BRW_OPCODE_ADD; + inst->src[1] = inst->src[2]; + inst->src[2] = reg_undef; + progress = true; + } else if (inst->src[2].is_one()) { + inst->opcode = BRW_OPCODE_ADD; + inst->src[2] = reg_undef; + progress = true; + } else if (inst->src[1].file == IMM && inst->src[2].file == IMM) { + inst->opcode = BRW_OPCODE_ADD; + inst->src[1].fixed_hw_reg.dw1.f *= inst->src[2].fixed_hw_reg.dw1.f; + inst->src[2] = reg_undef; + progress = true; + } + break; case SHADER_OPCODE_RCP: { fs_inst *prev = (fs_inst *)inst->prev; if (prev->opcode == SHADER_OPCODE_SQRT) { |