From 61ee5e62a2beeb2e405ff3aa5e3eb26d1bf5437d Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 5 Apr 2016 14:10:04 -0700 Subject: [PATCH] i965/vec4: Use can_do_writemask in can_reswizzle Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_vec4.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 4d0efa8fbfd..87b5ff98f8c 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -965,10 +965,12 @@ vec4_instruction::can_reswizzle(const struct brw_device_info *devinfo, int swizzle_mask) { /* Gen6 MATH instructions can not execute in align16 mode, so swizzles - * or writemasking are not allowed. + * are not allowed. */ - if (devinfo->gen == 6 && is_math() && - (swizzle != BRW_SWIZZLE_XYZW || dst_writemask != WRITEMASK_XYZW)) + if (devinfo->gen == 6 && is_math() && swizzle != BRW_SWIZZLE_XYZW) + return false; + + if (!can_do_writemask(devinfo) && dst_writemask != WRITEMASK_XYZW) return false; /* If this instruction sets anything not referenced by swizzle, then we'd -- 2.30.2