diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-05 14:10:04 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-15 14:04:38 -0700 |
| commit | 61ee5e62a2beeb2e405ff3aa5e3eb26d1bf5437d (patch) | |
| tree | dfcb008008e710cf45c080cfb99d00016079692f /src/mesa/drivers/dri/i965/brw_vec4.cpp | |
| parent | 75b68f9114dc3ba1b501fb7de8198c03b3dcb1fd (diff) | |
| download | external_mesa3d-61ee5e62a2beeb2e405ff3aa5e3eb26d1bf5437d.zip external_mesa3d-61ee5e62a2beeb2e405ff3aa5e3eb26d1bf5437d.tar.gz external_mesa3d-61ee5e62a2beeb2e405ff3aa5e3eb26d1bf5437d.tar.bz2 | |
i965/vec4: Use can_do_writemask in can_reswizzle
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vec4.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.cpp | 8 |
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 4d0efa8..87b5ff9 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 |