From 2ea16966ae66d4dd5c5dcb996d7996d9c734bbee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg=20Kristensen?= Date: Wed, 23 Sep 2015 16:57:47 -0700 Subject: [PATCH] i965: Respect stride and subreg_offset for ATTR registers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When we assign hw regs to attributes, we don't incorporate the stride and subreg_offset from the fs_reg. It's rarely used, but the integer multiplication lowering uses unusual stride and subreg_offset combination breaks when one source is an attribute. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91970 Cc: "10.6 11.0" Signed-off-by: Kristian Høgsberg Kristensen Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_fs.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 225a3122c79..618bbd2866a 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -1564,7 +1564,10 @@ fs_visitor::assign_vs_urb_setup() inst->src[i].file = HW_REG; inst->src[i].fixed_hw_reg = - retype(brw_vec8_grf(grf, 0), inst->src[i].type); + stride(byte_offset(retype(brw_vec8_grf(grf, 0), inst->src[i].type), + inst->src[i].subreg_offset), + inst->exec_size * inst->src[i].stride, + inst->exec_size, inst->src[i].stride); } } } -- 2.30.2