fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 01:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Use implicit backend_reg copy-constructor.

Browse source 
In order to do this, we have to change the signature of the
backend_reg(brw_reg) constructor to take a reference to a brw_reg in
order to avoid unresolvable ambiguity about which constructor is
actually being called in the other modifications in this patch.

As far as I understand it, the rule in C++ is that if multiple
constructors are available for parent classes, the one closest to you in
the class heirarchy is closen, but if one of them didn't take a
reference, that screws things up.

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
Matt Turner 2015-11-20 21:18:26 -08:00
parent 309a44d63c
commit f093c842e6
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_shader.h
View file

@ -42,7 +42,7 @@
struct backend_reg : public brw_reg
{
backend_reg() {}
backend_reg(struct brw_reg reg) : brw_reg(reg) {}
backend_reg(const struct brw_reg &reg) : brw_reg(reg) {}
bool equals(const backend_reg &r) const;

6
src/mesa/drivers/dri/i965/brw_vec4.cpp
View file

@ -79,9 +79,8 @@ src_reg::src_reg(struct brw_reg reg) :
}
src_reg::src_reg(const dst_reg &reg) :
backend_reg(static_cast<struct brw_reg>(reg))
backend_reg(reg)
{
this->reg_offset = reg.reg_offset;
this->reladdr = reg.reladdr;
this->swizzle = brw_swizzle_for_mask(reg.writemask);
}
@ -137,9 +136,8 @@ dst_reg::dst_reg(struct brw_reg reg) :
}
dst_reg::dst_reg(const src_reg &reg) :
backend_reg(static_cast<struct brw_reg>(reg))
backend_reg(reg)
{
this->reg_offset = reg.reg_offset;
this->writemask = brw_mask_for_swizzle(reg.swizzle);
this->reladdr = reg.reladdr;
}