summaryrefslogtreecommitdiff
path: root/vmwgfx
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2014-04-02 14:05:23 +0200
committerThomas Hellstrom <thellstrom@vmware.com>2014-04-03 10:38:19 +0200
commit64e0faf1480663a990e0f6aeef7af0e69845af49 (patch)
tree3160f1296f85a65313e9c09f14bb25a7b25d7929 /vmwgfx
parentc062d08a50a26c99a3b8f565a8b2b00e8dc21c3f (diff)
vmware/vmwgfx: Don't tell XA that we have a mask when we haven't
In some cases, the X server sends us a composit operation with mask_pict != NULL, but mask_pix == NULL. Assume there's no mask involved in that case. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'vmwgfx')
-rw-r--r--vmwgfx/vmwgfx_saa.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index 3da0222..99a289d 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -1158,6 +1158,8 @@ vmwgfx_composite_prepare(struct saa_driver *driver, CARD8 op,
* and check whether XA can accelerate.
*/
+ if (!mask_pix)
+ mask_pict = NULL;
xa_comp = vmwgfx_xa_setup_comp(vsaa->vcomp, op,
src_pict, mask_pict, dst_pict);
if (!xa_comp)