diff options
| author | Matt Turner <[email protected]> | 2015-10-24 14:35:33 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2015-11-13 11:27:50 -0800 |
| commit | 433df2e03c9a066bb2975bed28b57d6e2edf0aa9 (patch) | |
| tree | ee647e7604ef9b401ddf79a3dc8bf30afd60d613 | |
| parent | c7ed5d1d1ca5d0e537cd5eb2cc8d4cae7ae73564 (diff) | |
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 <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_ir_fs.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_ir_vec4.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.h | 3 |
3 files changed, 2 insertions, 5 deletions
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 |