From 66d8bd3b7e577b7ae4d0b29186dce95d615e2c40 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Tue, 27 Sep 2016 12:23:44 +0200 Subject: [PATCH] i965: fix subnr overflow in suboffset() Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/brw_reg.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_reg.h b/src/mesa/drivers/dri/i965/brw_reg.h index 3b46d27fcd2..8907c9c5c60 100644 --- a/src/mesa/drivers/dri/i965/brw_reg.h +++ b/src/mesa/drivers/dri/i965/brw_reg.h @@ -519,14 +519,6 @@ sechalf(struct brw_reg reg) return reg; } -static inline struct brw_reg -suboffset(struct brw_reg reg, unsigned delta) -{ - reg.subnr += delta * type_sz(reg.type); - return reg; -} - - static inline struct brw_reg offset(struct brw_reg reg, unsigned delta) { @@ -544,6 +536,11 @@ byte_offset(struct brw_reg reg, unsigned bytes) return reg; } +static inline struct brw_reg +suboffset(struct brw_reg reg, unsigned delta) +{ + return byte_offset(reg, delta * type_sz(reg.type)); +} /** Construct unsigned word[16] register */ static inline struct brw_reg -- 2.30.2