i965/fs: fix subreg_offset overflow in byte_offset()
This can happen if the register already has a non-zero subreg_offset when byte_offset() is called. v2 (Sam): - Refactor byte_offset() (Jordan). Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
parent
2fd79ebe8f
commit
17decd940c
|
@ -80,19 +80,21 @@ retype(fs_reg reg, enum brw_reg_type type)
|
|||
static inline fs_reg
|
||||
byte_offset(fs_reg reg, unsigned delta)
|
||||
{
|
||||
reg.subreg_offset += delta;
|
||||
|
||||
switch (reg.file) {
|
||||
case BAD_FILE:
|
||||
break;
|
||||
case VGRF:
|
||||
case ATTR:
|
||||
reg.reg_offset += delta / 32;
|
||||
reg.reg_offset += reg.subreg_offset / 32;
|
||||
break;
|
||||
case MRF:
|
||||
reg.nr += delta / 32;
|
||||
break;
|
||||
case UNIFORM:
|
||||
reg.reg_offset += delta / 4;
|
||||
reg.subreg_offset += delta % 4;
|
||||
reg.reg_offset += reg.subreg_offset / 4;
|
||||
reg.subreg_offset %= 4;
|
||||
return reg;
|
||||
case ARF:
|
||||
case FIXED_GRF:
|
||||
|
@ -100,7 +102,7 @@ byte_offset(fs_reg reg, unsigned delta)
|
|||
default:
|
||||
assert(delta == 0);
|
||||
}
|
||||
reg.subreg_offset += delta % 32;
|
||||
reg.subreg_offset %= 32;
|
||||
return reg;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue