Module: Mesa Branch: 11.0 Commit: dace17bfd4e2c8e72387a0cfe0aabfa9927c50c7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dace17bfd4e2c8e72387a0cfe0aabfa9927c50c7
Author: Kristian Høgsberg Kristensen <k...@bitplanet.net> Date: Wed Sep 23 16:57:47 2015 -0700 i965: Respect stride and subreg_offset for ATTR registers 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" <mesa-sta...@lists.freedesktop.org> Signed-off-by: Kristian Høgsberg Kristensen <k...@bitplanet.net> Reviewed-by: Matt Turner <matts...@gmail.com> (cherry picked from commit 2ea16966ae66d4dd5c5dcb996d7996d9c734bbee) --- 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 4983f89..4e9c96c 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -1556,7 +1556,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); } } } _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
