From: Matt Turner Date: Sat, 24 Oct 2015 21:35:33 +0000 (-0700) Subject: i965: Delete abs/negate fields from backend_reg. X-Git-Tag: android-x86-6.0-r1~5843 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=433df2e03c9a066bb2975bed28b57d6e2edf0aa9;p=android-x86%2Fexternal-mesa.git i965: Delete abs/negate fields from backend_reg. Instead use the ones provided by brw_reg. Also allows us to handle HW_REGs in the negate() functions. Reviewed-by: Emil Velikov Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/dri/i965/brw_ir_fs.h b/src/mesa/drivers/dri/i965/brw_ir_fs.h index 4417555f18e..c0e486e5edc 100644 --- a/src/mesa/drivers/dri/i965/brw_ir_fs.h +++ b/src/mesa/drivers/dri/i965/brw_ir_fs.h @@ -72,7 +72,7 @@ public: static inline fs_reg negate(fs_reg reg) { - assert(reg.file != HW_REG && reg.file != IMM); + assert(reg.file != IMM); reg.negate = !reg.negate; return reg; } diff --git a/src/mesa/drivers/dri/i965/brw_ir_vec4.h b/src/mesa/drivers/dri/i965/brw_ir_vec4.h index 29642c6d2a4..2fbb043f244 100644 --- a/src/mesa/drivers/dri/i965/brw_ir_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_ir_vec4.h @@ -90,7 +90,7 @@ swizzle(src_reg reg, unsigned swizzle) static inline src_reg negate(src_reg reg) { - assert(reg.file != HW_REG && reg.file != IMM); + assert(reg.file != IMM); reg.negate = !reg.negate; return reg; } diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h index e1e89dd3212..73b57f4f8d1 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.h +++ b/src/mesa/drivers/dri/i965/brw_shader.h @@ -82,9 +82,6 @@ struct backend_reg : public brw_reg uint16_t reg_offset; struct brw_reg fixed_hw_reg; - - bool negate; - bool abs; }; #endif