Merge remote-tracking branch 'airlied/for-keithp'

This commit is contained in:
Keith Packard 2012-08-06 16:42:34 -07:00
commit 360fa7736b
2 changed files with 11 additions and 1 deletions

View file

@ -148,6 +148,10 @@ PixmapPtr PixmapShareToSlave(PixmapPtr pixmap, ScreenPtr slave)
pixmap->drawable.height, depth, 0,
pixmap->devKind, NULL);
/* have the slave pixmap take a reference on the master pixmap
later we destroy them both at the same time */
pixmap->refcnt++;
spix->master_pixmap = pixmap;
ret = slave->SetSharedPixmapBacking(spix, handle);