i965/fs: Use a const reference in fs_reg::equals instead of a pointer.

This lets you omit some ampersands and is more idiomatic C++.  Using
const also marks the function as not altering either register (which
was obvious, but nice to enforce).

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke 2012-05-10 16:10:14 -07:00
parent bf78806133
commit d1029f9988
3 changed files with 16 additions and 16 deletions

View File

@ -1618,7 +1618,7 @@ fs_visitor::get_instruction_generating_reg(fs_inst *start,
end->predicated ||
end->force_uncompressed ||
end->force_sechalf ||
!reg.equals(&end->dst)) {
!reg.equals(end->dst)) {
return NULL;
} else {
return end;

View File

@ -126,18 +126,18 @@ public:
fs_reg(enum register_file file, int reg, uint32_t type);
fs_reg(class fs_visitor *v, const struct glsl_type *type);
bool equals(fs_reg *r)
bool equals(const fs_reg &r) const
{
return (file == r->file &&
reg == r->reg &&
reg_offset == r->reg_offset &&
type == r->type &&
negate == r->negate &&
abs == r->abs &&
memcmp(&fixed_hw_reg, &r->fixed_hw_reg,
return (file == r.file &&
reg == r.reg &&
reg_offset == r.reg_offset &&
type == r.type &&
negate == r.negate &&
abs == r.abs &&
memcmp(&fixed_hw_reg, &r.fixed_hw_reg,
sizeof(fixed_hw_reg)) == 0 &&
smear == r->smear &&
imm.u == r->imm.u);
smear == r.smear &&
imm.u == r.imm.u);
}
/** Register file: ARF, GRF, MRF, IMM. */
@ -291,10 +291,10 @@ public:
bool equals(fs_inst *inst)
{
return (opcode == inst->opcode &&
dst.equals(&inst->dst) &&
src[0].equals(&inst->src[0]) &&
src[1].equals(&inst->src[1]) &&
src[2].equals(&inst->src[2]) &&
dst.equals(inst->dst) &&
src[0].equals(inst->src[0]) &&
src[1].equals(inst->src[1]) &&
src[2].equals(inst->src[2]) &&
saturate == inst->saturate &&
predicated == inst->predicated &&
conditional_mod == inst->conditional_mod &&

View File

@ -569,7 +569,7 @@ fs_visitor::emit_assignment_writes(fs_reg &l, fs_reg &r,
l.type = brw_type_for_base_type(type);
r.type = brw_type_for_base_type(type);
if (predicated || !l.equals(&r)) {
if (predicated || !l.equals(r)) {
fs_inst *inst = emit(BRW_OPCODE_MOV, l, r);
inst->predicated = predicated;
}