From cb30727648fea301cfff1647d947bfab540c3bf6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Samuel=20Iglesias=20Gons=C3=A1lvez?= Date: Thu, 26 May 2016 07:56:38 +0200 Subject: [PATCH] i965/fs: fix FS_OPCODE_CINTERP for unpacked double input varyings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Data starts at suboffet 3 in 32-bit units (12 bytes), so it is not 64-bit aligned and the current implementation fails to read the data properly. Instead, when there is is a double input varying, read it as vector of floats with twice the number of components. Signed-off-by: Samuel Iglesias Gonsálvez Reviewed-by: Timothy Arceri Cc: "12.0" --- src/mesa/drivers/dri/i965/brw_fs.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 366d9ffbffb..4b29ee52883 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -1189,7 +1189,18 @@ fs_visitor::emit_general_interpolation(fs_reg *attr, const char *name, * handed us defined values in only the constant offset * field of the setup reg. */ - for (unsigned int i = 0; i < type->vector_elements; i++) { + unsigned vector_elements = type->vector_elements; + + /* Data starts at suboffet 3 in 32-bit units (12 bytes), so it is not + * 64-bit aligned and the current implementation fails to read the + * data properly. Instead, when there is is a double input varying, + * read it as vector of floats with twice the number of components. + */ + if (attr->type == BRW_REGISTER_TYPE_DF) { + vector_elements *= 2; + attr->type = BRW_REGISTER_TYPE_F; + } + for (unsigned int i = 0; i < vector_elements; i++) { struct brw_reg interp = interp_reg(*location, i); interp = suboffset(interp, 3); interp.type = attr->type; -- 2.30.2