i965/vec4: Remove swizzle/writemask fields from src/dst_reg.
Also allows us to handle HW_REGs in the swizzle() and writemask() functions. Reviewed-by: Emil Velikov <emil.velikov@collabora.co.uk> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
@@ -55,8 +55,6 @@ public:
|
||||
|
||||
explicit src_reg(const dst_reg ®);
|
||||
|
||||
unsigned swizzle; /**< BRW_SWIZZLE_XYZW macros from brw_reg.h. */
|
||||
|
||||
src_reg *reladdr;
|
||||
};
|
||||
|
||||
@@ -82,7 +80,6 @@ offset(src_reg reg, unsigned delta)
|
||||
static inline src_reg
|
||||
swizzle(src_reg reg, unsigned swizzle)
|
||||
{
|
||||
assert(reg.file != HW_REG);
|
||||
reg.swizzle = brw_compose_swizzle(swizzle, reg.swizzle);
|
||||
return reg;
|
||||
}
|
||||
@@ -122,8 +119,6 @@ public:
|
||||
|
||||
bool equals(const dst_reg &r) const;
|
||||
|
||||
unsigned writemask; /**< Bitfield of WRITEMASK_[XYZW] */
|
||||
|
||||
src_reg *reladdr;
|
||||
};
|
||||
|
||||
@@ -145,7 +140,7 @@ offset(dst_reg reg, unsigned delta)
|
||||
static inline dst_reg
|
||||
writemask(dst_reg reg, unsigned mask)
|
||||
{
|
||||
assert(reg.file != HW_REG && reg.file != IMM);
|
||||
assert(reg.file != IMM);
|
||||
assert((reg.writemask & mask) != 0);
|
||||
reg.writemask &= mask;
|
||||
return reg;
|
||||
|
||||
@@ -125,7 +125,6 @@ src_reg::src_reg(struct brw_reg reg) :
|
||||
this->file = HW_REG;
|
||||
this->reg = 0;
|
||||
this->reg_offset = 0;
|
||||
this->swizzle = BRW_SWIZZLE_XXXX;
|
||||
this->reladdr = NULL;
|
||||
}
|
||||
|
||||
@@ -188,7 +187,6 @@ dst_reg::dst_reg(struct brw_reg reg) :
|
||||
this->file = HW_REG;
|
||||
this->reg = 0;
|
||||
this->reg_offset = 0;
|
||||
this->writemask = WRITEMASK_XYZW;
|
||||
this->reladdr = NULL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user