summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2016-09-01 14:19:27 -0700
committerFrancisco Jerez <currojerez@riseup.net>2016-09-14 14:50:53 -0700
commit9a523dd051fc06bfd89f32fcd85535d268472820 (patch)
treed5dc66d9bf4a8323a890c5fd7f6f98056bde2f80
parentfba020e5af49d9d9a2c6e4d4b79115ed1e74a127 (diff)
downloadexternal_mesa3d-9a523dd051fc06bfd89f32fcd85535d268472820.zip
external_mesa3d-9a523dd051fc06bfd89f32fcd85535d268472820.tar.gz
external_mesa3d-9a523dd051fc06bfd89f32fcd85535d268472820.tar.bz2
i965/ir: Remove backend_reg::reg_offset.
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_shader.cpp2
-rw-r--r--src/mesa/drivers/dri/i965/brw_shader.h15
2 files changed, 2 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
index 29435f6..e599235 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -749,8 +749,6 @@ backend_reg::in_range(const backend_reg &r, unsigned n) const
{
return (file == r.file &&
nr == r.nr &&
- reg_offset >= r.reg_offset &&
- reg_offset < r.reg_offset + n &&
offset >= r.offset &&
offset < r.offset + n * REG_SIZE);
}
diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h
index 72b94b6..66264b4 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.h
+++ b/src/mesa/drivers/dri/i965/brw_shader.h
@@ -44,14 +44,14 @@ struct backend_reg : private brw_reg
const brw_reg &as_brw_reg() const
{
assert(file == ARF || file == FIXED_GRF || file == MRF || file == IMM);
- assert(reg_offset == 0 && offset == 0);
+ assert(offset == 0);
return static_cast<const brw_reg &>(*this);
}
brw_reg &as_brw_reg()
{
assert(file == ARF || file == FIXED_GRF || file == MRF || file == IMM);
- assert(reg_offset == 0 && offset == 0);
+ assert(offset == 0);
return static_cast<brw_reg &>(*this);
}
@@ -64,17 +64,6 @@ struct backend_reg : private brw_reg
bool is_accumulator() const;
bool in_range(const backend_reg &r, unsigned n) const;
- /**
- * Offset within the virtual register.
- *
- * In the scalar backend, this is in units of a float per pixel for pre-
- * register allocation registers (i.e., one register in SIMD8 mode and two
- * registers in SIMD16 mode).
- *
- * For uniforms, this is in units of 1 float.
- */
- uint16_t reg_offset;
-
/** Offset from the start of the (virtual) register in bytes. */
uint16_t offset;