KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Iago Toral Quiroga 2016-04-06 10:27:14 +02:00 committed by Samuel Iglesias Gonsálvez
parent 2fd79ebe8f
commit 17decd940c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesa/drivers/dri/i965/brw_ir_fs.h
View File

@ -80,19 +80,21 @@ retype(fs_reg reg, enum brw_reg_type type)
static inline fs_reg static inline fs_reg
byte_offset(fs_reg reg, unsigned delta) byte_offset(fs_reg reg, unsigned delta)
{ {
reg.subreg_offset += delta;
switch (reg.file) { switch (reg.file) {
case BAD_FILE: case BAD_FILE:
break; break;
case VGRF: case VGRF:
case ATTR: case ATTR:
reg.reg_offset += delta / 32; reg.reg_offset += reg.subreg_offset / 32;
break; break;
case MRF: case MRF:
reg.nr += delta / 32; reg.nr += delta / 32;
break; break;
case UNIFORM: case UNIFORM:
reg.reg_offset += delta / 4; reg.reg_offset += reg.subreg_offset / 4;
reg.subreg_offset += delta % 4; reg.subreg_offset %= 4;
return reg; return reg;
case ARF: case ARF:
case FIXED_GRF: case FIXED_GRF:
@ -100,7 +102,7 @@ byte_offset(fs_reg reg, unsigned delta)
default: default:
assert(delta == 0); assert(delta == 0);
} }
reg.subreg_offset += delta % 32; reg.subreg_offset %= 32;
return reg; return reg;
} }