i965: fix subnr overflow in suboffset()

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2016-09-27 12:23:44 +02:00
parent 86c4575a81
commit 66d8bd3b7e
1 changed files with 5 additions and 8 deletions
@@ -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