summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_vec4.cpp
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2016-04-05 14:10:04 -0700
committerJason Ekstrand <[email protected]>2016-04-15 14:04:38 -0700
commit61ee5e62a2beeb2e405ff3aa5e3eb26d1bf5437d (patch)
treedfcb008008e710cf45c080cfb99d00016079692f /src/mesa/drivers/dri/i965/brw_vec4.cpp
parent75b68f9114dc3ba1b501fb7de8198c03b3dcb1fd (diff)
i965/vec4: Use can_do_writemask in can_reswizzle
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vec4.cpp')
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4.cpp8
1 files 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