diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 05:12:20 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 05:12:20 +0100 |
| commit | a9787fc2e79065e8f56fdace41f4e565667c22bb (patch) | |
| tree | 19559f26bed90d12689ee47145b27fcd7619820a /nx-X11/programs/Xserver/dix/pixmap.c | |
| parent | b40dec982d17b010cedc183ebdc4c75ca7de785f (diff) | |
| parent | 6dcfcbabe6b87467a6f811d0dc03efba7bfce8e4 (diff) | |
| download | nx-libs-a9787fc2e79065e8f56fdace41f4e565667c22bb.tar.gz nx-libs-a9787fc2e79065e8f56fdace41f4e565667c22bb.tar.bz2 nx-libs-a9787fc2e79065e8f56fdace41f4e565667c22bb.zip | |
Merge branch 'uli42-pr/update_dix' into 3.6.x
Attributes GH PR #646: https://github.com/ArcticaProject/nx-libs/pull/646
Diffstat (limited to 'nx-X11/programs/Xserver/dix/pixmap.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/pixmap.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/pixmap.c b/nx-X11/programs/Xserver/dix/pixmap.c index 709f413ed..247fa34ab 100644 --- a/nx-X11/programs/Xserver/dix/pixmap.c +++ b/nx-X11/programs/Xserver/dix/pixmap.c @@ -124,6 +124,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize) * is a quick workaround intended to fix a problem reported * by Valgrind due to fbBlt() writing just after the end of * the pixmap buffer. This may be a RENDER bug. + * This is not included in xorg upstream! */ pPixmap = (PixmapPtr)calloc(1, pScreen->totalPixmapSize + pixDataSize + 4); @@ -146,5 +147,13 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize) #else pPixmap = (PixmapPtr)calloc(1, sizeof(PixmapRec) + pixDataSize); #endif + +#ifdef _XSERVER64 + if (pPixmap) { + pPixmap->drawable.pad0 = 0; + pPixmap->drawable.pad1 = 0; + } +#endif + return pPixmap; } |