mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-29 21:46:40 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: hw/xnest/Pixmap.c include/dix.h
This commit is contained in:
commit
2d17f47cc7
46 changed files with 92 additions and 977 deletions
|
|
@ -57,6 +57,7 @@ xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
|
|||
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
|
||||
pPixmap->refcnt = 1;
|
||||
pPixmap->devKind = PixmapBytePad(width, depth);
|
||||
pPixmap->usage_hint = usage_hint;
|
||||
dixSetPrivate(&pPixmap->devPrivates, xnestPixmapPrivateKey,
|
||||
(char *)pPixmap + pScreen->totalPixmapSize);
|
||||
if (width && height)
|
||||
|
|
|
|||
Loading…
Reference in a new issue