diff options
author | Matt Turner <mattst88@gmail.com> | 2015-10-25 21:14:56 -0700 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2015-11-13 11:27:50 -0800 |
commit | 58fa9d47b536403c4e3ca5d6a2495691338388fd (patch) | |
tree | 4cb2ac309566ef7c5b7b72cbac1e39f1dbc4f873 /src/mesa/drivers/dri/i965/brw_ir_vec4.h | |
parent | 94b1031703b1b5759436fe215323727cffce5f86 (diff) | |
download | external_mesa3d-58fa9d47b536403c4e3ca5d6a2495691338388fd.zip external_mesa3d-58fa9d47b536403c4e3ca5d6a2495691338388fd.tar.gz external_mesa3d-58fa9d47b536403c4e3ca5d6a2495691338388fd.tar.bz2 |
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>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_ir_vec4.h')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_ir_vec4.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_ir_vec4.h b/src/mesa/drivers/dri/i965/brw_ir_vec4.h index 0b2a925..a19a262 100644 --- a/src/mesa/drivers/dri/i965/brw_ir_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_ir_vec4.h @@ -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; |