Revision: 148344 https://trac.macports.org/changeset/148344 Author: jeremyhu@macports.org Date: 2016-05-04 15:56:44 -0700 (Wed, 04 May 2016) Log Message: ----------- xorg-server-devel: Bump to current master Modified Paths: -------------- trunk/dports/x11/xorg-server-devel/Portfile trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch Added Paths: ----------- trunk/dports/x11/xorg-server-devel/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch trunk/dports/x11/xorg-server-devel/files/5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch trunk/dports/x11/xorg-server-devel/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch trunk/dports/x11/xorg-server-devel/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch Removed Paths: ------------- trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch Modified: trunk/dports/x11/xorg-server-devel/Portfile =================================================================== --- trunk/dports/x11/xorg-server-devel/Portfile 2016-05-04 21:56:51 UTC (rev 148343) +++ trunk/dports/x11/xorg-server-devel/Portfile 2016-05-04 22:56:44 UTC (rev 148344) @@ -5,7 +5,7 @@ name xorg-server-devel conflicts xorg-server set my_name xorg-server -version 1.18.0 +version 1.18.99.1 categories x11 devel license X11 maintainers jeremyhu openmaintainer @@ -16,7 +16,7 @@ fetch.type git git.url git://anongit.freedesktop.org/xorg/xserver -git.branch 4457fd45efef85b567d4a0ac085d252ffe49020d +git.branch 66fdeb880aac0966be9aa41219047ade0148c35f #git.branch xorg-server-${version} use_parallel_build yes @@ -82,10 +82,11 @@ patchfiles \ 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \ - 5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \ - 5002-Use-old-miTrapezoids-and-miTriangles-routines.patch \ - 5003-fb-Revert-fb-changes-that-broke-XQuartz.patch \ - 5004-fb-Revert-fb-changes-that-broke-XQuartz.patch + 5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \ + 5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \ + 5003-Use-old-miTrapezoids-and-miTriangles-routines.patch \ + 5004-fb-Revert-fb-changes-that-broke-XQuartz.patch \ + 5005-fb-Revert-fb-changes-that-broke-XQuartz.patch patch.pre_args -p1 Modified: trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch =================================================================== --- trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2016-05-04 21:56:51 UTC (rev 148343) +++ trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2016-05-04 22:56:44 UTC (rev 148344) @@ -1,7 +1,7 @@ -From 4b22984e7f7cdde1d50b84d3a1d977eb0b5df28a Mon Sep 17 00:00:00 2001 +From 8d0796bfa8ab8599994b5d029182428d62398712 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston <jeremyhu@apple.com> Date: Fri, 13 Jan 2012 12:00:57 -0800 -Subject: [PATCH 5000/5004] sdksyms.sh: Use CPPFLAGS, not CFLAGS +Subject: [PATCH 5000/5005] sdksyms.sh: Use CPPFLAGS, not CFLAGS CFLAGS can include flags which are not useful to the preprocessor or can even cause it to fail. This fixes a build issue on darwin @@ -14,7 +14,7 @@ 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am -index 64c4f74..e77981d 100644 +index 85bd0be..6de7c10 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -48,8 +48,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ @@ -27,7 +27,7 @@ -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \ -I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3 -@@ -135,7 +134,7 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh +@@ -137,7 +136,7 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh EXTRA_DIST += sdksyms.sh sdksyms.dep sdksyms.c: sdksyms.sh @@ -37,5 +37,5 @@ SDKSYMS_DEP = sdksyms.dep -include $(SDKSYMS_DEP) -- -2.6.3 +2.8.1 Added: trunk/dports/x11/xorg-server-devel/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch =================================================================== --- trunk/dports/x11/xorg-server-devel/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch (rev 0) +++ trunk/dports/x11/xorg-server-devel/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch 2016-05-04 22:56:44 UTC (rev 148344) @@ -0,0 +1,348 @@ +From 5103ec7f937fc64a355da212c013619437dcf545 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 26 Dec 2015 10:56:52 -0800 +Subject: [PATCH 5001/5005] Revert "dix: Restore PaintWindow screen hook" + +This reverts commit cbd3cfbad3f07b20e90ea9498110f255813eb441. +--- + composite/compwindow.c | 2 +- + dix/window.c | 4 ++-- + hw/xquartz/quartz.c | 4 ++-- + hw/xwin/winrandr.c | 2 +- + include/scrnintstr.h | 5 ----- + mi/miexpose.c | 32 +++++++++++++++++++++++++++----- + mi/mioverlay.c | 11 +++++------ + mi/miscrinit.c | 1 - + mi/miwindow.c | 6 ++---- + miext/rootless/rootlessCommon.h | 1 - + miext/rootless/rootlessScreen.c | 3 +-- + miext/rootless/rootlessWindow.c | 23 +---------------------- + miext/rootless/rootlessWindow.h | 1 - + 13 files changed, 42 insertions(+), 53 deletions(-) + +diff --git a/composite/compwindow.c b/composite/compwindow.c +index 344138a..77bdfa2 100644 +--- a/composite/compwindow.c ++++ b/composite/compwindow.c +@@ -104,7 +104,7 @@ compRepaintBorder(ClientPtr pClient, void *closure) + + RegionNull(&exposed); + RegionSubtract(&exposed, &pWindow->borderClip, &pWindow->winSize); +- pWindow->drawable.pScreen->PaintWindow(pWindow, &exposed, PW_BORDER); ++ miPaintWindow(pWindow, &exposed, PW_BORDER); + RegionUninit(&exposed); + } + return TRUE; +diff --git a/dix/window.c b/dix/window.c +index ead4dc2..6f31396 100644 +--- a/dix/window.c ++++ b/dix/window.c +@@ -1592,7 +1592,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client) + + RegionNull(&exposed); + RegionSubtract(&exposed, &pWin->borderClip, &pWin->winSize); +- pWin->drawable.pScreen->PaintWindow(pWin, &exposed, PW_BORDER); ++ miPaintWindow(pWin, &exposed, PW_BORDER); + RegionUninit(&exposed); + } + return error; +@@ -3159,7 +3159,7 @@ dixSaveScreens(ClientPtr client, int on, int mode) + + /* make it look like screen saver is off, so that + * NotClippedByChildren will compute a clip list +- * for the root window, so PaintWindow works ++ * for the root window, so miPaintWindow works + */ + screenIsSaved = SCREEN_SAVER_OFF; + (*pWin->drawable.pScreen->MoveWindow) (pWin, +diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c +index c8b6f96..2def8e3 100644 +--- a/hw/xquartz/quartz.c ++++ b/hw/xquartz/quartz.c +@@ -300,8 +300,8 @@ QuartzUpdateScreens(void) + + quartzProcs->UpdateScreen(pScreen); + +- /* PaintWindow needs to be called after RootlessUpdateScreenPixmap (from xprUpdateScreen) */ +- pScreen->PaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND); ++ /* miPaintWindow needs to be called after RootlessUpdateScreenPixmap (from xprUpdateScreen) */ ++ miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND); + + /* Tell RandR about the new size, so new connections get the correct info */ + RRScreenSizeNotify(pScreen); +diff --git a/hw/xwin/winrandr.c b/hw/xwin/winrandr.c +index 1560199..73bbc9d 100644 +--- a/hw/xwin/winrandr.c ++++ b/hw/xwin/winrandr.c +@@ -134,7 +134,7 @@ winDoRandRScreenSetSize(ScreenPtr pScreen, + SetRootClip(pScreen, ROOT_CLIP_FULL); + + // and arrange for it to be repainted +- pScreen->PaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND); ++ miPaintWindow(pRoot, &pRoot->borderClip, PW_BACKGROUND); + + /* Indicate that a screen size change took place */ + RRScreenSizeNotify(pScreen); +diff --git a/include/scrnintstr.h b/include/scrnintstr.h +index 2e617c4..a627fe7 100644 +--- a/include/scrnintstr.h ++++ b/include/scrnintstr.h +@@ -158,10 +158,6 @@ typedef void (*PostValidateTreeProcPtr) (WindowPtr /*pParent */ , + typedef void (*WindowExposuresProcPtr) (WindowPtr /*pWindow */ , + RegionPtr /*prgn */); + +-typedef void (*PaintWindowProcPtr) (WindowPtr /*pWindow*/, +- RegionPtr /*pRegion*/, +- int /*what*/); +- + typedef void (*CopyWindowProcPtr) (WindowPtr /*pWindow */ , + DDXPointRec /*ptOldOrg */ , + RegionPtr /*prgnSrc */ ); +@@ -502,7 +498,6 @@ typedef struct _Screen { + ClearToBackgroundProcPtr ClearToBackground; + ClipNotifyProcPtr ClipNotify; + RestackWindowProcPtr RestackWindow; +- PaintWindowProcPtr PaintWindow; + + /* Pixmap procedures */ + +diff --git a/mi/miexpose.c b/mi/miexpose.c +index 148d1a6..f4c6e89 100644 +--- a/mi/miexpose.c ++++ b/mi/miexpose.c +@@ -268,11 +268,10 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + RegionTranslate(&rgnExposed, pDstDrawable->x, pDstDrawable->y); + + if (extents) { +- /* PaintWindow doesn't clip, so we have to */ ++ /* miPaintWindow doesn't clip, so we have to */ + RegionIntersect(&rgnExposed, &rgnExposed, &pWin->clipList); + } +- pDstDrawable->pScreen->PaintWindow((WindowPtr) pDstDrawable, +- &rgnExposed, PW_BACKGROUND); ++ miPaintWindow((WindowPtr) pDstDrawable, &rgnExposed, PW_BACKGROUND); + + if (extents) { + RegionReset(&rgnExposed, &expBox); +@@ -384,14 +383,16 @@ miWindowExposures(WindowPtr pWin, RegionPtr prgn) + * work overall, on both client and server. This is cheating, but + * isn't prohibited by the protocol ("spontaneous combustion" :-). + */ +- BoxRec box = *RegionExtents(prgn); ++ BoxRec box; ++ ++ box = *RegionExtents(prgn); + exposures = &expRec; + RegionInit(exposures, &box, 1); + RegionReset(prgn, &box); + /* miPaintWindow doesn't clip, so we have to */ + RegionIntersect(prgn, prgn, &pWin->clipList); + } +- pWin->drawable.pScreen->PaintWindow(pWin, prgn, PW_BACKGROUND); ++ miPaintWindow(pWin, prgn, PW_BACKGROUND); + if (clientInterested) + miSendExposures(pWin, exposures, + pWin->drawable.x, pWin->drawable.y); +@@ -401,6 +402,14 @@ miWindowExposures(WindowPtr pWin, RegionPtr prgn) + } + } + ++#ifdef ROOTLESS ++/* Ugly, ugly, but we lost our hooks into miPaintWindow... =/ */ ++void RootlessSetPixmapOfAncestors(WindowPtr pWin); ++void RootlessStartDrawing(WindowPtr pWin); ++void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn); ++Bool IsFramedWindow(WindowPtr pWin); ++#endif ++ + void + miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) + { +@@ -428,6 +437,19 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) + Bool solid = TRUE; + DrawablePtr drawable = &pWin->drawable; + ++#ifdef ROOTLESS ++ if (IsFramedWindow(pWin)) { ++ RootlessStartDrawing(pWin); ++ RootlessDamageRegion(pWin, prgn); ++ ++ if (pWin->backgroundState == ParentRelative) { ++ if ((what == PW_BACKGROUND) || ++ (what == PW_BORDER && !pWin->borderIsPixel)) ++ RootlessSetPixmapOfAncestors(pWin); ++ } ++ } ++#endif ++ + if (what == PW_BACKGROUND) { + while (pWin->backgroundState == ParentRelative) + pWin = pWin->parent; +diff --git a/mi/mioverlay.c b/mi/mioverlay.c +index b8b7a5b..a2715e9 100644 +--- a/mi/mioverlay.c ++++ b/mi/mioverlay.c +@@ -844,8 +844,8 @@ miOverlayHandleExposures(WindowPtr pWin) + if ((mival = pTree->valdata)) { + if (!((*pPriv->InOverlay) (pTree->pWin))) { + if (RegionNotEmpty(&mival->borderExposed)) { +- pScreen->PaintWindow(pTree->pWin, &mival->borderExposed, +- PW_BORDER); ++ miPaintWindow(pTree->pWin, &mival->borderExposed, ++ PW_BORDER); + } + RegionUninit(&mival->borderExposed); + +@@ -883,8 +883,7 @@ miOverlayHandleExposures(WindowPtr pWin) + } + else { + if (RegionNotEmpty(&val->after.borderExposed)) { +- pScreen->PaintWindow(pChild, &val->after.borderExposed, +- PW_BORDER); ++ miPaintWindow(pChild, &val->after.borderExposed, PW_BORDER); + } + (*WindowExposures) (pChild, &val->after.exposed); + } +@@ -1008,7 +1007,7 @@ miOverlayWindowExposures(WindowPtr pWin, RegionPtr prgn) + else + RegionIntersect(prgn, prgn, &pWin->clipList); + } +- pScreen->PaintWindow(pWin, prgn, PW_BACKGROUND); ++ miPaintWindow(pWin, prgn, PW_BACKGROUND); + if (clientInterested) + miSendExposures(pWin, exposures, + pWin->drawable.x, pWin->drawable.y); +@@ -1607,7 +1606,7 @@ miOverlayClearToBackground(WindowPtr pWin, + if (generateExposures) + (*pScreen->WindowExposures) (pWin, ®); + else if (pWin->backgroundState != None) +- pScreen->PaintWindow(pWin, ®, PW_BACKGROUND); ++ miPaintWindow(pWin, ®, PW_BACKGROUND); + RegionUninit(®); + } + +diff --git a/mi/miscrinit.c b/mi/miscrinit.c +index 9c6af0d..b53c7e4 100644 +--- a/mi/miscrinit.c ++++ b/mi/miscrinit.c +@@ -253,7 +253,6 @@ miScreenInit(ScreenPtr pScreen, void *pbits, /* pointer to screen bits */ + pScreen->ClearToBackground = miClearToBackground; + pScreen->ClipNotify = (ClipNotifyProcPtr) 0; + pScreen->RestackWindow = (RestackWindowProcPtr) 0; +- pScreen->PaintWindow = miPaintWindow; + /* CreatePixmap, DestroyPixmap */ + /* RealizeFont, UnrealizeFont */ + /* CreateGC */ +diff --git a/mi/miwindow.c b/mi/miwindow.c +index 39c279e..2fc7cfb 100644 +--- a/mi/miwindow.c ++++ b/mi/miwindow.c +@@ -113,7 +113,7 @@ miClearToBackground(WindowPtr pWin, + if (generateExposures) + (*pWin->drawable.pScreen->WindowExposures) (pWin, ®); + else if (pWin->backgroundState != None) +- pWin->drawable.pScreen->PaintWindow(pWin, ®, PW_BACKGROUND); ++ miPaintWindow(pWin, ®, PW_BACKGROUND); + RegionUninit(®); + } + +@@ -219,9 +219,7 @@ miHandleValidateExposures(WindowPtr pWin) + while (1) { + if ((val = pChild->valdata)) { + if (RegionNotEmpty(&val->after.borderExposed)) +- pWin->drawable.pScreen->PaintWindow(pChild, +- &val->after.borderExposed, +- PW_BORDER); ++ miPaintWindow(pChild, &val->after.borderExposed, PW_BORDER); + RegionUninit(&val->after.borderExposed); + (*WindowExposures) (pChild, &val->after.exposed); + RegionUninit(&val->after.exposed); +diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h +index c3fa2a2..7fdea22 100644 +--- a/miext/rootless/rootlessCommon.h ++++ b/miext/rootless/rootlessCommon.h +@@ -94,7 +94,6 @@ typedef struct _RootlessScreenRec { + ChangeBorderWidthProcPtr ChangeBorderWidth; + PositionWindowProcPtr PositionWindow; + ChangeWindowAttributesProcPtr ChangeWindowAttributes; +- PaintWindowProcPtr PaintWindow; + + CreateGCProcPtr CreateGC; + CopyWindowProcPtr CopyWindow; +diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c +index 4716564..6226ee8 100644 +--- a/miext/rootless/rootlessScreen.c ++++ b/miext/rootless/rootlessScreen.c +@@ -473,7 +473,7 @@ expose_1(WindowPtr pWin) + if (!pWin->realized) + return; + +- pWin->drawable.pScreen->PaintWindow(pWin, &pWin->borderClip, PW_BACKGROUND); ++ miPaintWindow(pWin, &pWin->borderClip, PW_BACKGROUND); + + /* FIXME: comments in windowstr.h indicate that borderClip doesn't + include subwindow visibility. But I'm not so sure.. so we may +@@ -669,7 +669,6 @@ RootlessWrap(ScreenPtr pScreen) + WRAP(CloseScreen); + WRAP(CreateGC); + WRAP(CopyWindow); +- WRAP(PaintWindow); + WRAP(GetImage); + WRAP(SourceValidate); + WRAP(CreateWindow); +diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c +index e304299..3240acc 100644 +--- a/miext/rootless/rootlessWindow.c ++++ b/miext/rootless/rootlessWindow.c +@@ -720,7 +720,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, + /* + * RootlessCopyWindow + * Update *new* location of window. Old location is redrawn with +- * PaintWindow. Cloned from fbCopyWindow. ++ * miPaintWindow. Cloned from fbCopyWindow. + * The original always draws on the root pixmap, which we don't have. + * Instead, draw on the parent window's pixmap. + */ +@@ -794,27 +794,6 @@ RootlessCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) + RL_DEBUG_MSG("copywindowFB end\n"); + } + +-void +-RootlessPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) +-{ +- ScreenPtr pScreen = pWin->drawable.pScreen; +- +- if (IsFramedWindow(pWin)) { +- RootlessStartDrawing(pWin); +- RootlessDamageRegion(pWin, prgn); +- +- if (pWin->backgroundState == ParentRelative) { +- if ((what == PW_BACKGROUND) || +- (what == PW_BORDER && !pWin->borderIsPixel)) +- RootlessSetPixmapOfAncestors(pWin); +- } +- } +- +- SCREEN_UNWRAP(pScreen, PaintWindow); +- pScreen->PaintWindow(pWin, prgn, what); +- SCREEN_WRAP(pScreen, PaintWindow); +-} +- + /* + * Window resize procedures + */ +diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h +index 4fd34d5..d3955fc 100644 +--- a/miext/rootless/rootlessWindow.h ++++ b/miext/rootless/rootlessWindow.h +@@ -48,7 +48,6 @@ Bool RootlessUnrealizeWindow(WindowPtr pWin); + void RootlessRestackWindow(WindowPtr pWin, WindowPtr pOldNextSib); + void RootlessCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, + RegionPtr prgnSrc); +-void RootlessPaintWindow(WindowPtr pWin, RegionPtr prgn, int what); + void RootlessMoveWindow(WindowPtr pWin, int x, int y, WindowPtr pSib, + VTKind kind); + void RootlessResizeWindow(WindowPtr pWin, int x, int y, unsigned int w, +-- +2.8.1 + Deleted: trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch =================================================================== --- trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2016-05-04 21:56:51 UTC (rev 148343) +++ trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2016-05-04 22:56:44 UTC (rev 148344) @@ -1,111 +0,0 @@ -From b7277926822e54c1d2413c4fe5bc7e0fd0d8fd90 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Fri, 30 Apr 2010 13:08:25 -0700 -Subject: [PATCH 5001/5004] Workaround the GC clipping problem in miPaintWindow - and add some debugging output. - -http://xquartz.macosforge.org/trac/ticket/290 -http://trac.macports.org/ticket/49465 - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- - mi/miexpose.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 69 insertions(+) - -diff --git a/mi/miexpose.c b/mi/miexpose.c -index 148d1a6..1fa3c48 100644 ---- a/mi/miexpose.c -+++ b/mi/miexpose.c -@@ -428,6 +428,19 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) - Bool solid = TRUE; - DrawablePtr drawable = &pWin->drawable; - -+#ifdef XQUARTZ_CLIP_DEBUG -+ ErrorF("START %d BS %d (pR = %ld)\n", what, pWin->backgroundState, ParentRelative); -+ ErrorF(" Rgn: %d %d %d %d\n", prgn->extents.x1, prgn->extents.y1, -+ prgn->extents.x2 - prgn->extents.x1, -+ prgn->extents.y2 - prgn->extents.y1); -+ ErrorF(" Win: %d %d (%d %d) %d %d\n", pWin->origin.x, pWin->origin.y, -+ pWin->winSize.extents.x1, pWin->winSize.extents.y1, -+ pWin->winSize.extents.x2 - pWin->winSize.extents.x1, -+ pWin->winSize.extents.y2 - pWin->winSize.extents.y1); -+ ErrorF(" Draw: %d %d %d %d\n", pWin->drawable.x, pWin->drawable.y, -+ pWin->drawable.width, pWin->drawable.height); -+#endif -+ - if (what == PW_BACKGROUND) { - while (pWin->backgroundState == ParentRelative) - pWin = pWin->parent; -@@ -462,6 +475,11 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) - pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable); - drawable = &pixmap->drawable; - -+#ifdef XQUARTZ_CLIP_DEBUG -+ ErrorF(" Draw: %d %d %d %d\n", -+ drawable->x, drawable->y, drawable->width, drawable->height); -+#endif -+ - while (pWin->backgroundState == ParentRelative) - pWin = pWin->parent; - -@@ -528,6 +546,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) - ChangeGC(NullClient, pGC, gcmask, gcval); - ValidateGC(drawable, pGC); - -+#ifdef XQUARTZ_CLIP_DEBUG -+ ErrorF(" GC: %d %d %d %d\n", -+ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1, -+ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1, -+ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1); -+#endif -+ -+#ifdef XQUARTZ -+ /* Looks like our clipping isn't set right for some reason: -+ * http://xquartz.macosforge.org/trac/ticket/290 -+ */ -+ if(what == PW_BORDER) { -+ -+#if 0 -+ if(solid) { -+#if 1 -+ fbFillRegionSolid(&pWin->drawable, -+ prgn, -+ 0, -+ fbReplicatePixel(fill.pixel, -+ pWin->drawable.bitsPerPixel)); -+#else -+ fbFillRegionSolid(drawable, -+ prgn, -+ 0, -+ fbReplicatePixel(fill.pixel, -+ drawable->bitsPerPixel)); -+#endif -+ return; -+ } -+#endif -+ -+ pGC->pCompositeClip->extents.x1 += prgn->extents.x1; -+ pGC->pCompositeClip->extents.y1 += prgn->extents.y1; -+ pGC->pCompositeClip->extents.x2 += prgn->extents.x1; -+ pGC->pCompositeClip->extents.y2 += prgn->extents.y1; -+ -+ if(pGC->pCompositeClip->extents.x2 > drawable->pScreen->width) -+ pGC->pCompositeClip->extents.x2 = drawable->pScreen->width; -+ if(pGC->pCompositeClip->extents.y2 > drawable->pScreen->height) -+ pGC->pCompositeClip->extents.y2 = drawable->pScreen->height; -+ } -+#endif -+ -+#ifdef XQUARTZ_CLIP_DEBUG -+ ErrorF(" GC: %d %d %d %d\n", -+ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1, -+ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1, -+ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1); -+#endif -+ - numRects = RegionNumRects(prgn); - pbox = RegionRects(prgn); - for (i = numRects; --i >= 0; pbox++, prect++) { --- -2.6.3 - Deleted: trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch =================================================================== --- trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch 2016-05-04 21:56:51 UTC (rev 148343) +++ trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch 2016-05-04 22:56:44 UTC (rev 148344) @@ -1,289 +0,0 @@ -From c646cf3b17511b0f9eba39a735fb256715b0961a Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 2 Nov 2013 11:00:23 -0700 -Subject: [PATCH 5002/5004] Use old miTrapezoids and miTriangles routines - -Reverts commits: - 788ccb9a8bcf6a4fb4054c507111eec3338fb969 - 566f1931ee2916269e164e114bffaf2da1d039d1 - -http://xquartz.macosforge.org/trac/ticket/525 - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> ---- - fb/fbpict.c | 2 - - render/mipict.c | 4 +- - render/mipict.h | 27 ++++++++++++++ - render/mitrap.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - render/mitri.c | 61 +++++++++++++++++++++++++++++++ - 5 files changed, 201 insertions(+), 4 deletions(-) - -diff --git a/fb/fbpict.c b/fb/fbpict.c -index 7ea0b66..434d890 100644 ---- a/fb/fbpict.c -+++ b/fb/fbpict.c -@@ -508,10 +508,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) - ps->UnrealizeGlyph = fbUnrealizeGlyph; - ps->CompositeRects = miCompositeRects; - ps->RasterizeTrapezoid = fbRasterizeTrapezoid; -- ps->Trapezoids = fbTrapezoids; - ps->AddTraps = fbAddTraps; - ps->AddTriangles = fbAddTriangles; -- ps->Triangles = fbTriangles; - - return TRUE; - } -diff --git a/render/mipict.c b/render/mipict.c -index 4b85512..a39eb2c 100644 ---- a/render/mipict.c -+++ b/render/mipict.c -@@ -575,8 +575,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) - ps->Composite = 0; /* requires DDX support */ - ps->Glyphs = miGlyphs; - ps->CompositeRects = miCompositeRects; -- ps->Trapezoids = 0; -- ps->Triangles = 0; -+ ps->Trapezoids = miTrapezoids; -+ ps->Triangles = miTriangles; - - ps->RasterizeTrapezoid = 0; /* requires DDX support */ - ps->AddTraps = 0; /* requires DDX support */ -diff --git a/render/mipict.h b/render/mipict.h -index 3241be4..8ee7a8a 100644 ---- a/render/mipict.h -+++ b/render/mipict.h -@@ -102,9 +102,36 @@ miCompositeRects(CARD8 op, - xRenderColor * color, int nRect, xRectangle *rects); - - extern _X_EXPORT void -+miTriangles (CARD8 op, -+ PicturePtr pSrc, -+ PicturePtr pDst, -+ PictFormatPtr maskFormat, -+ INT16 xSrc, -+ INT16 ySrc, -+ int ntri, -+ xTriangle *tris); -+ -+extern _X_EXPORT PicturePtr -+miCreateAlphaPicture (ScreenPtr pScreen, -+ PicturePtr pDst, -+ PictFormatPtr pPictFormat, -+ CARD16 width, -+ CARD16 height); -+ -+extern _X_EXPORT void - miTrapezoidBounds(int ntrap, xTrapezoid * traps, BoxPtr box); - - extern _X_EXPORT void -+miTrapezoids (CARD8 op, -+ PicturePtr pSrc, -+ PicturePtr pDst, -+ PictFormatPtr maskFormat, -+ INT16 xSrc, -+ INT16 ySrc, -+ int ntrap, -+ xTrapezoid *traps); -+ -+extern _X_EXPORT void - miPointFixedBounds(int npoint, xPointFixed * points, BoxPtr bounds); - - extern _X_EXPORT void -diff --git a/render/mitrap.c b/render/mitrap.c -index 17b6dcd..71c1857 100644 ---- a/render/mitrap.c -+++ b/render/mitrap.c -@@ -34,6 +34,55 @@ - #include "picturestr.h" - #include "mipict.h" - -+PicturePtr -+miCreateAlphaPicture (ScreenPtr pScreen, -+ PicturePtr pDst, -+ PictFormatPtr pPictFormat, -+ CARD16 width, -+ CARD16 height) -+{ -+ PixmapPtr pPixmap; -+ PicturePtr pPicture; -+ GCPtr pGC; -+ int error; -+ xRectangle rect; -+ -+ if (width > 32767 || height > 32767) -+ return 0; -+ -+ if (!pPictFormat) -+ { -+ if (pDst->polyEdge == PolyEdgeSharp) -+ pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1); -+ else -+ pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8); -+ if (!pPictFormat) -+ return 0; -+ } -+ -+ pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, -+ pPictFormat->depth, 0); -+ if (!pPixmap) -+ return 0; -+ pGC = GetScratchGC (pPixmap->drawable.depth, pScreen); -+ if (!pGC) -+ { -+ (*pScreen->DestroyPixmap) (pPixmap); -+ return 0; -+ } -+ ValidateGC (&pPixmap->drawable, pGC); -+ rect.x = 0; -+ rect.y = 0; -+ rect.width = width; -+ rect.height = height; -+ (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect); -+ FreeScratchGC (pGC); -+ pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat, -+ 0, 0, serverClient, &error); -+ (*pScreen->DestroyPixmap) (pPixmap); -+ return pPicture; -+} -+ - static xFixed - miLineFixedX(xLineFixed * l, xFixed y, Bool ceil) - { -@@ -79,3 +128,65 @@ miTrapezoidBounds(int ntrap, xTrapezoid * traps, BoxPtr box) - box->x2 = x2; - } - } -+ -+ -+void -+miTrapezoids (CARD8 op, -+ PicturePtr pSrc, -+ PicturePtr pDst, -+ PictFormatPtr maskFormat, -+ INT16 xSrc, -+ INT16 ySrc, -+ int ntrap, -+ xTrapezoid *traps) -+{ -+ ScreenPtr pScreen = pDst->pDrawable->pScreen; -+ PictureScreenPtr ps = GetPictureScreen(pScreen); -+ -+ /* -+ * Check for solid alpha add -+ */ -+ if (op == PictOpAdd && miIsSolidAlpha (pSrc)) -+ { -+ for (; ntrap; ntrap--, traps++) -+ (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0); -+ } -+ else if (maskFormat) -+ { -+ PicturePtr pPicture; -+ BoxRec bounds; -+ INT16 xDst, yDst; -+ INT16 xRel, yRel; -+ -+ xDst = traps[0].left.p1.x >> 16; -+ yDst = traps[0].left.p1.y >> 16; -+ -+ miTrapezoidBounds (ntrap, traps, &bounds); -+ if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) -+ return; -+ pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat, -+ bounds.x2 - bounds.x1, -+ bounds.y2 - bounds.y1); -+ if (!pPicture) -+ return; -+ for (; ntrap; ntrap--, traps++) -+ (*ps->RasterizeTrapezoid) (pPicture, traps, -+ -bounds.x1, -bounds.y1); -+ xRel = bounds.x1 + xSrc - xDst; -+ yRel = bounds.y1 + ySrc - yDst; -+ CompositePicture (op, pSrc, pPicture, pDst, -+ xRel, yRel, 0, 0, bounds.x1, bounds.y1, -+ bounds.x2 - bounds.x1, -+ bounds.y2 - bounds.y1); -+ FreePicture (pPicture, 0); -+ } -+ else -+ { -+ if (pDst->polyEdge == PolyEdgeSharp) -+ maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1); -+ else -+ maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8); -+ for (; ntrap; ntrap--, traps++) -+ miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps); -+ } -+} -diff --git a/render/mitri.c b/render/mitri.c -index 922f22a..bdca9ca 100644 ---- a/render/mitri.c -+++ b/render/mitri.c -@@ -65,3 +65,64 @@ miTriangleBounds(int ntri, xTriangle * tris, BoxPtr bounds) - { - miPointFixedBounds(ntri * 3, (xPointFixed *) tris, bounds); - } -+ -+ -+void -+miTriangles (CARD8 op, -+ PicturePtr pSrc, -+ PicturePtr pDst, -+ PictFormatPtr maskFormat, -+ INT16 xSrc, -+ INT16 ySrc, -+ int ntri, -+ xTriangle *tris) -+{ -+ ScreenPtr pScreen = pDst->pDrawable->pScreen; -+ PictureScreenPtr ps = GetPictureScreen(pScreen); -+ -+ /* -+ * Check for solid alpha add -+ */ -+ if (op == PictOpAdd && miIsSolidAlpha (pSrc)) -+ { -+ (*ps->AddTriangles) (pDst, 0, 0, ntri, tris); -+ } -+ else if (maskFormat) -+ { -+ BoxRec bounds; -+ PicturePtr pPicture; -+ INT16 xDst, yDst; -+ INT16 xRel, yRel; -+ -+ xDst = tris[0].p1.x >> 16; -+ yDst = tris[0].p1.y >> 16; -+ -+ miTriangleBounds (ntri, tris, &bounds); -+ if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1) -+ return; -+ pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat, -+ bounds.x2 - bounds.x1, -+ bounds.y2 - bounds.y1); -+ if (!pPicture) -+ return; -+ (*ps->AddTriangles) (pPicture, -bounds.x1, -bounds.y1, ntri, tris); -+ -+ xRel = bounds.x1 + xSrc - xDst; -+ yRel = bounds.y1 + ySrc - yDst; -+ CompositePicture (op, pSrc, pPicture, pDst, -+ xRel, yRel, 0, 0, bounds.x1, bounds.y1, -+ bounds.x2 - bounds.x1, bounds.y2 - bounds.y1); -+ FreePicture (pPicture, 0); -+ } -+ else -+ { -+ if (pDst->polyEdge == PolyEdgeSharp) -+ maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1); -+ else -+ maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8); -+ -+ for (; ntri; ntri--, tris++) -+ miTriangles (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, tris); -+ } -+} -+ --- -2.6.3 - Added: trunk/dports/x11/xorg-server-devel/files/5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch =================================================================== --- trunk/dports/x11/xorg-server-devel/files/5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch (rev 0) +++ trunk/dports/x11/xorg-server-devel/files/5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2016-05-04 22:56:44 UTC (rev 148344) @@ -0,0 +1,158 @@ +From 04d7c9360a106564666337e961da78c3f52bf72d Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston <jeremyhu@apple.com> +Date: Fri, 30 Apr 2010 13:08:25 -0700 +Subject: [PATCH 5002/5005] Workaround the GC clipping problem in miPaintWindow + and add some debugging output. + +Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> +--- + mi/miexpose.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 90 insertions(+), 9 deletions(-) + +diff --git a/mi/miexpose.c b/mi/miexpose.c +index f4c6e89..fe3bcb1 100644 +--- a/mi/miexpose.c ++++ b/mi/miexpose.c +@@ -408,7 +408,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin); + void RootlessStartDrawing(WindowPtr pWin); + void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn); + Bool IsFramedWindow(WindowPtr pWin); +-#endif ++#include "../fb/fb.h" ++#endif + + void + miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) +@@ -437,20 +438,32 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) + Bool solid = TRUE; + DrawablePtr drawable = &pWin->drawable; + ++#ifdef XQUARTZ_CLIP_DEBUG ++ ErrorF("START %d BS %d (pR = %ld)\n", what, pWin->backgroundState, ParentRelative); ++ ErrorF(" Rgn: %d %d %d %d\n", prgn->extents.x1, prgn->extents.y1, ++ prgn->extents.x2 - prgn->extents.x1, ++ prgn->extents.y2 - prgn->extents.y1); ++ ErrorF(" Win: %d %d (%d %d) %d %d\n", pWin->origin.x, pWin->origin.y, ++ pWin->winSize.extents.x1, pWin->winSize.extents.y1, ++ pWin->winSize.extents.x2 - pWin->winSize.extents.x1, ++ pWin->winSize.extents.y2 - pWin->winSize.extents.y1); ++ ErrorF(" Draw: %d %d %d %d\n", pWin->drawable.x, pWin->drawable.y, ++ pWin->drawable.width, pWin->drawable.height); ++#endif ++ ++ if (what == PW_BACKGROUND) ++ { + #ifdef ROOTLESS +- if (IsFramedWindow(pWin)) { +- RootlessStartDrawing(pWin); +- RootlessDamageRegion(pWin, prgn); ++ if(IsFramedWindow(pWin)) { ++ RootlessStartDrawing(pWin); ++ RootlessDamageRegion(pWin, prgn); + +- if (pWin->backgroundState == ParentRelative) { +- if ((what == PW_BACKGROUND) || +- (what == PW_BORDER && !pWin->borderIsPixel)) ++ if(pWin->backgroundState == ParentRelative) { + RootlessSetPixmapOfAncestors(pWin); ++ } + } +- } + #endif + +- if (what == PW_BACKGROUND) { + while (pWin->backgroundState == ParentRelative) + pWin = pWin->parent; + +@@ -475,6 +488,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) + else { + PixmapPtr pixmap; + ++#ifdef ROOTLESS ++ if(IsFramedWindow(pWin)) { ++ RootlessStartDrawing(pWin); ++ RootlessDamageRegion(pWin, prgn); ++ ++ if(!pWin->borderIsPixel && ++ pWin->backgroundState == ParentRelative) { ++ RootlessSetPixmapOfAncestors(pWin); ++ } ++ } ++#endif ++ + fill = pWin->border; + solid = pWin->borderIsPixel; + +@@ -484,6 +509,11 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) + pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable); + drawable = &pixmap->drawable; + ++#ifdef XQUARTZ_CLIP_DEBUG ++ ErrorF(" Draw: %d %d %d %d\n", ++ drawable->x, drawable->y, drawable->width, drawable->height); ++#endif ++ + while (pWin->backgroundState == ParentRelative) + pWin = pWin->parent; + +@@ -550,6 +580,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) + ChangeGC(NullClient, pGC, gcmask, gcval); + ValidateGC(drawable, pGC); + ++#ifdef XQUARTZ_CLIP_DEBUG ++ ErrorF(" GC: %d %d %d %d\n", ++ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1, ++ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1, ++ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1); ++#endif ++ ++#ifdef XQUARTZ ++ /* Looks like our clipping isn't set right for some reason: ++ * http://xquartz.macosforge.org/trac/ticket/290 ++ */ ++ if(what == PW_BORDER) { ++ ++#if 0 ++ if(solid) { ++#if 1 ++ fbFillRegionSolid(&pWin->drawable, ++ prgn, ++ 0, ++ fbReplicatePixel(fill.pixel, ++ pWin->drawable.bitsPerPixel)); ++#else ++ fbFillRegionSolid(drawable, ++ prgn, ++ 0, ++ fbReplicatePixel(fill.pixel, ++ drawable->bitsPerPixel)); ++#endif ++ return; ++ } ++#endif ++ ++ pGC->pCompositeClip->extents.x1 += prgn->extents.x1; ++ pGC->pCompositeClip->extents.y1 += prgn->extents.y1; ++ pGC->pCompositeClip->extents.x2 += prgn->extents.x1; ++ pGC->pCompositeClip->extents.y2 += prgn->extents.y1; ++ ++ if(pGC->pCompositeClip->extents.x2 > drawable->pScreen->width) ++ pGC->pCompositeClip->extents.x2 = drawable->pScreen->width; ++ if(pGC->pCompositeClip->extents.y2 > drawable->pScreen->height) ++ pGC->pCompositeClip->extents.y2 = drawable->pScreen->height; ++ } ++#endif ++ ++#ifdef XQUARTZ_CLIP_DEBUG ++ ErrorF(" GC: %d %d %d %d\n", ++ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1, ++ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1, ++ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1); ++#endif ++ + numRects = RegionNumRects(prgn); + pbox = RegionRects(prgn); + for (i = numRects; --i >= 0; pbox++, prect++) { +-- +2.8.1 + Added: trunk/dports/x11/xorg-server-devel/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch =================================================================== --- trunk/dports/x11/xorg-server-devel/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch (rev 0) +++ trunk/dports/x11/xorg-server-devel/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch 2016-05-04 22:56:44 UTC (rev 148344) @@ -0,0 +1,289 @@ +From 963cad095b31c534f827019cb0b83a96b37cbef2 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 2 Nov 2013 11:00:23 -0700 +Subject: [PATCH 5003/5005] Use old miTrapezoids and miTriangles routines + +Reverts commits: + 788ccb9a8bcf6a4fb4054c507111eec3338fb969 + 566f1931ee2916269e164e114bffaf2da1d039d1 + +http://xquartz.macosforge.org/trac/ticket/525 + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + fb/fbpict.c | 2 - + render/mipict.c | 4 +- + render/mipict.h | 27 ++++++++++++++ + render/mitrap.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + render/mitri.c | 61 +++++++++++++++++++++++++++++++ + 5 files changed, 201 insertions(+), 4 deletions(-) + +diff --git a/fb/fbpict.c b/fb/fbpict.c +index 7ea0b66..434d890 100644 +--- a/fb/fbpict.c ++++ b/fb/fbpict.c +@@ -508,10 +508,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) + ps->UnrealizeGlyph = fbUnrealizeGlyph; + ps->CompositeRects = miCompositeRects; + ps->RasterizeTrapezoid = fbRasterizeTrapezoid; +- ps->Trapezoids = fbTrapezoids; + ps->AddTraps = fbAddTraps; + ps->AddTriangles = fbAddTriangles; +- ps->Triangles = fbTriangles; + + return TRUE; + } +diff --git a/render/mipict.c b/render/mipict.c +index 4b85512..a39eb2c 100644 +--- a/render/mipict.c ++++ b/render/mipict.c +@@ -575,8 +575,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) + ps->Composite = 0; /* requires DDX support */ + ps->Glyphs = miGlyphs; + ps->CompositeRects = miCompositeRects; +- ps->Trapezoids = 0; +- ps->Triangles = 0; ++ ps->Trapezoids = miTrapezoids; ++ ps->Triangles = miTriangles; + + ps->RasterizeTrapezoid = 0; /* requires DDX support */ + ps->AddTraps = 0; /* requires DDX support */ +diff --git a/render/mipict.h b/render/mipict.h +index 3241be4..8ee7a8a 100644 +--- a/render/mipict.h ++++ b/render/mipict.h +@@ -102,9 +102,36 @@ miCompositeRects(CARD8 op, + xRenderColor * color, int nRect, xRectangle *rects); + + extern _X_EXPORT void ++miTriangles (CARD8 op, ++ PicturePtr pSrc, ++ PicturePtr pDst, ++ PictFormatPtr maskFormat, ++ INT16 xSrc, ++ INT16 ySrc, ++ int ntri, ++ xTriangle *tris); ++ ++extern _X_EXPORT PicturePtr ++miCreateAlphaPicture (ScreenPtr pScreen, ++ PicturePtr pDst, ++ PictFormatPtr pPictFormat, ++ CARD16 width, ++ CARD16 height); ++ ++extern _X_EXPORT void + miTrapezoidBounds(int ntrap, xTrapezoid * traps, BoxPtr box); + + extern _X_EXPORT void ++miTrapezoids (CARD8 op, ++ PicturePtr pSrc, ++ PicturePtr pDst, ++ PictFormatPtr maskFormat, ++ INT16 xSrc, ++ INT16 ySrc, ++ int ntrap, ++ xTrapezoid *traps); ++ ++extern _X_EXPORT void + miPointFixedBounds(int npoint, xPointFixed * points, BoxPtr bounds); + + extern _X_EXPORT void +diff --git a/render/mitrap.c b/render/mitrap.c +index 17b6dcd..71c1857 100644 +--- a/render/mitrap.c ++++ b/render/mitrap.c +@@ -34,6 +34,55 @@ + #include "picturestr.h" + #include "mipict.h" + ++PicturePtr ++miCreateAlphaPicture (ScreenPtr pScreen, ++ PicturePtr pDst, ++ PictFormatPtr pPictFormat, ++ CARD16 width, ++ CARD16 height) ++{ ++ PixmapPtr pPixmap; ++ PicturePtr pPicture; ++ GCPtr pGC; ++ int error; ++ xRectangle rect; ++ ++ if (width > 32767 || height > 32767) ++ return 0; ++ ++ if (!pPictFormat) ++ { ++ if (pDst->polyEdge == PolyEdgeSharp) ++ pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1); ++ else ++ pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8); ++ if (!pPictFormat) ++ return 0; ++ } ++ ++ pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, ++ pPictFormat->depth, 0); ++ if (!pPixmap) ++ return 0; ++ pGC = GetScratchGC (pPixmap->drawable.depth, pScreen); ++ if (!pGC) ++ { ++ (*pScreen->DestroyPixmap) (pPixmap); ++ return 0; ++ } ++ ValidateGC (&pPixmap->drawable, pGC); ++ rect.x = 0; ++ rect.y = 0; ++ rect.width = width; ++ rect.height = height; ++ (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect); ++ FreeScratchGC (pGC); ++ pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat, ++ 0, 0, serverClient, &error); ++ (*pScreen->DestroyPixmap) (pPixmap); ++ return pPicture; ++} ++ + static xFixed + miLineFixedX(xLineFixed * l, xFixed y, Bool ceil) + { +@@ -79,3 +128,65 @@ miTrapezoidBounds(int ntrap, xTrapezoid * traps, BoxPtr box) + box->x2 = x2; + } + } ++ ++ ++void ++miTrapezoids (CARD8 op, ++ PicturePtr pSrc, ++ PicturePtr pDst, ++ PictFormatPtr maskFormat, ++ INT16 xSrc, ++ INT16 ySrc, ++ int ntrap, ++ xTrapezoid *traps) ++{ ++ ScreenPtr pScreen = pDst->pDrawable->pScreen; ++ PictureScreenPtr ps = GetPictureScreen(pScreen); ++ ++ /* ++ * Check for solid alpha add ++ */ ++ if (op == PictOpAdd && miIsSolidAlpha (pSrc)) ++ { ++ for (; ntrap; ntrap--, traps++) ++ (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0); ++ } ++ else if (maskFormat) ++ { ++ PicturePtr pPicture; ++ BoxRec bounds; ++ INT16 xDst, yDst; ++ INT16 xRel, yRel; ++ ++ xDst = traps[0].left.p1.x >> 16; ++ yDst = traps[0].left.p1.y >> 16; ++ ++ miTrapezoidBounds (ntrap, traps, &bounds); ++ if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) ++ return; ++ pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat, ++ bounds.x2 - bounds.x1, ++ bounds.y2 - bounds.y1); ++ if (!pPicture) ++ return; ++ for (; ntrap; ntrap--, traps++) ++ (*ps->RasterizeTrapezoid) (pPicture, traps, ++ -bounds.x1, -bounds.y1); ++ xRel = bounds.x1 + xSrc - xDst; ++ yRel = bounds.y1 + ySrc - yDst; ++ CompositePicture (op, pSrc, pPicture, pDst, ++ xRel, yRel, 0, 0, bounds.x1, bounds.y1, ++ bounds.x2 - bounds.x1, ++ bounds.y2 - bounds.y1); ++ FreePicture (pPicture, 0); ++ } ++ else ++ { ++ if (pDst->polyEdge == PolyEdgeSharp) ++ maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1); ++ else ++ maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8); ++ for (; ntrap; ntrap--, traps++) ++ miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps); ++ } ++} +diff --git a/render/mitri.c b/render/mitri.c +index 922f22a..bdca9ca 100644 +--- a/render/mitri.c ++++ b/render/mitri.c +@@ -65,3 +65,64 @@ miTriangleBounds(int ntri, xTriangle * tris, BoxPtr bounds) + { + miPointFixedBounds(ntri * 3, (xPointFixed *) tris, bounds); + } ++ ++ ++void ++miTriangles (CARD8 op, ++ PicturePtr pSrc, ++ PicturePtr pDst, ++ PictFormatPtr maskFormat, ++ INT16 xSrc, ++ INT16 ySrc, ++ int ntri, ++ xTriangle *tris) ++{ ++ ScreenPtr pScreen = pDst->pDrawable->pScreen; ++ PictureScreenPtr ps = GetPictureScreen(pScreen); ++ ++ /* ++ * Check for solid alpha add ++ */ ++ if (op == PictOpAdd && miIsSolidAlpha (pSrc)) ++ { ++ (*ps->AddTriangles) (pDst, 0, 0, ntri, tris); ++ } ++ else if (maskFormat) ++ { ++ BoxRec bounds; ++ PicturePtr pPicture; ++ INT16 xDst, yDst; ++ INT16 xRel, yRel; ++ ++ xDst = tris[0].p1.x >> 16; ++ yDst = tris[0].p1.y >> 16; ++ ++ miTriangleBounds (ntri, tris, &bounds); ++ if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1) ++ return; ++ pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat, ++ bounds.x2 - bounds.x1, ++ bounds.y2 - bounds.y1); ++ if (!pPicture) ++ return; ++ (*ps->AddTriangles) (pPicture, -bounds.x1, -bounds.y1, ntri, tris); ++ ++ xRel = bounds.x1 + xSrc - xDst; ++ yRel = bounds.y1 + ySrc - yDst; ++ CompositePicture (op, pSrc, pPicture, pDst, ++ xRel, yRel, 0, 0, bounds.x1, bounds.y1, ++ bounds.x2 - bounds.x1, bounds.y2 - bounds.y1); ++ FreePicture (pPicture, 0); ++ } ++ else ++ { ++ if (pDst->polyEdge == PolyEdgeSharp) ++ maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1); ++ else ++ maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8); ++ ++ for (; ntri; ntri--, tris++) ++ miTriangles (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, tris); ++ } ++} ++ +-- +2.8.1 + Deleted: trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch =================================================================== --- trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2016-05-04 21:56:51 UTC (rev 148343) +++ trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2016-05-04 22:56:44 UTC (rev 148344) @@ -1,320 +0,0 @@ -From 9815dff3336a4a04fa4c6c8c0c75ea98ef8b82c5 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Fri, 12 Feb 2010 19:48:52 -0800 -Subject: [PATCH 5003/5004] fb: Revert fb changes that broke XQuartz - -http://bugs.freedesktop.org/show_bug.cgi?id=26124 - -Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5." -Revert "fb: Adjust transform or composite coordinates for pixman operations" - -http://bugs.freedesktop.org/26124 - -This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695. -This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1. - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- - fb/fb.h | 3 +-- - fb/fbpict.c | 82 ++++++++++++++++++------------------------------------------- - fb/fbtrap.c | 43 ++++++++++++++------------------ - 3 files changed, 43 insertions(+), 85 deletions(-) - -diff --git a/fb/fb.h b/fb/fb.h -index c687aa7..256a1ee 100644 ---- a/fb/fb.h -+++ b/fb/fb.h -@@ -1321,8 +1321,7 @@ fbFillRegionSolid(DrawablePtr pDrawable, - RegionPtr pRegion, FbBits and, FbBits xor); - - extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict, -- Bool has_clip, -- int *xoff, int *yoff); -+ Bool has_clip); - - extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *); - -diff --git a/fb/fbpict.c b/fb/fbpict.c -index 434d890..be8274b 100644 ---- a/fb/fbpict.c -+++ b/fb/fbpict.c -@@ -46,23 +46,18 @@ fbComposite(CARD8 op, - INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height) - { - pixman_image_t *src, *mask, *dest; -- int src_xoff, src_yoff; -- int msk_xoff, msk_yoff; -- int dst_xoff, dst_yoff; -- - miCompositeSourceValidate(pSrc); - if (pMask) - miCompositeSourceValidate(pMask); - -- src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff); -- mask = image_from_pict(pMask, FALSE, &msk_xoff, &msk_yoff); -- dest = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff); -+ src = image_from_pict(pSrc, TRUE); -+ mask = image_from_pict(pMask, TRUE); -+ dest = image_from_pict(pDst, TRUE); - - if (src && dest && !(pMask && !mask)) { - pixman_image_composite(op, src, mask, dest, -- xSrc + src_xoff, ySrc + src_yoff, -- xMask + msk_xoff, yMask + msk_yoff, -- xDst + dst_xoff, yDst + dst_yoff, width, height); -+ xSrc, ySrc, xMask, yMask, xDst, yDst, -+ width, height); - } - - free_pixman_pict(pSrc, src); -@@ -289,20 +284,22 @@ create_conical_gradient_image(PictGradient * gradient) - } - - static pixman_image_t * --create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) -+create_bits_picture(PicturePtr pict, Bool has_clip) - { -- PixmapPtr pixmap; - FbBits *bits; - FbStride stride; -- int bpp; -+ int bpp, xoff, yoff; - pixman_image_t *image; - -- fbGetDrawablePixmap(pict->pDrawable, pixmap, *xoff, *yoff); -- fbGetPixmapBitsData(pixmap, bits, stride, bpp); -+ fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff); -+ -+ bits = (FbBits*)((CARD8*)bits + -+ (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) + -+ (pict->pDrawable->x + xoff) * (bpp / 8)); - - image = pixman_image_create_bits((pixman_format_code_t) pict->format, -- pixmap->drawable.width, -- pixmap->drawable.height, (uint32_t *) bits, -+ pict->pDrawable->width, -+ pict->pDrawable->height, (uint32_t *) bits, - stride * sizeof(FbStride)); - - if (!image) -@@ -321,28 +318,21 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) - if (pict->clientClip) - pixman_image_set_has_client_clip(image, TRUE); - -- if (*xoff || *yoff) -- pixman_region_translate(pict->pCompositeClip, *xoff, *yoff); -+ pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y); - - pixman_image_set_clip_region(image, pict->pCompositeClip); - -- if (*xoff || *yoff) -- pixman_region_translate(pict->pCompositeClip, -*xoff, -*yoff); -+ pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y); - } - - /* Indexed table */ - if (pict->pFormat->index.devPrivate) - pixman_image_set_indexed(image, pict->pFormat->index.devPrivate); - -- /* Add in drawable origin to position within the image */ -- *xoff += pict->pDrawable->x; -- *yoff += pict->pDrawable->y; -- - return image; - } - - static pixman_image_t *image_from_pict_internal(PicturePtr pict, Bool has_clip, -- int *xoff, int *yoff, - Bool is_alpha_map); - - static void image_destroy(pixman_image_t *image, void *data) -@@ -351,32 +341,13 @@ static void image_destroy(pixman_image_t *image, void *data) - } - - static void --set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip, -- int *xoff, int *yoff, Bool is_alpha_map) -+set_image_properties(pixman_image_t * image, PicturePtr pict, Bool is_alpha_map) - { - pixman_repeat_t repeat; - pixman_filter_t filter; - - if (pict->transform) { -- /* For source images, adjust the transform to account -- * for the drawable offset within the pixman image, -- * then set the offset to 0 as it will be used -- * to compute positions within the transformed image. -- */ -- if (!has_clip) { -- struct pixman_transform adjusted; -- -- adjusted = *pict->transform; -- pixman_transform_translate(&adjusted, -- NULL, -- pixman_int_to_fixed(*xoff), -- pixman_int_to_fixed(*yoff)); -- pixman_image_set_transform(image, &adjusted); -- *xoff = 0; -- *yoff = 0; -- } -- else -- pixman_image_set_transform(image, pict->transform); -+ pixman_image_set_transform(image, pict->transform); - } - - switch (pict->repeatType) { -@@ -404,10 +375,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip, - * as the alpha map for this operation - */ - if (pict->alphaMap && !is_alpha_map) { -- int alpha_xoff, alpha_yoff; - pixman_image_t *alpha_map = -- image_from_pict_internal(pict->alphaMap, FALSE, &alpha_xoff, -- &alpha_yoff, TRUE); -+ image_from_pict_internal(pict->alphaMap, TRUE, TRUE); - - pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x, - pict->alphaOrigin.y); -@@ -445,8 +414,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip, - } - - static pixman_image_t * --image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff, -- Bool is_alpha_map) -+image_from_pict_internal(PicturePtr pict, Bool has_clip, Bool is_alpha_map) - { - pixman_image_t *image = NULL; - -@@ -454,7 +422,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff, - return NULL; - - if (pict->pDrawable) { -- image = create_bits_picture(pict, has_clip, xoff, yoff); -+ image = create_bits_picture(pict, has_clip); - } - else if (pict->pSourcePict) { - SourcePict *sp = pict->pSourcePict; -@@ -472,19 +440,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff, - else if (sp->type == SourcePictTypeConical) - image = create_conical_gradient_image(gradient); - } -- *xoff = *yoff = 0; - } - - if (image) -- set_image_properties(image, pict, has_clip, xoff, yoff, is_alpha_map); -- -+ set_image_properties (image, pict, is_alpha_map); - return image; - } - - pixman_image_t * --image_from_pict(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) -+image_from_pict (PicturePtr pict, Bool has_clip) - { -- return image_from_pict_internal(pict, has_clip, xoff, yoff, FALSE); -+ return image_from_pict_internal (pict, has_clip, FALSE); - } - - void -diff --git a/fb/fbtrap.c b/fb/fbtrap.c -index bf82f8f..0145ce9 100644 ---- a/fb/fbtrap.c -+++ b/fb/fbtrap.c -@@ -36,13 +36,12 @@ fbAddTraps(PicturePtr pPicture, - INT16 x_off, INT16 y_off, int ntrap, xTrap * traps) - { - pixman_image_t *image; -- int dst_xoff, dst_yoff; - -- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff))) -- return; -- -- pixman_add_traps(image, x_off + dst_xoff, y_off + dst_yoff, -- ntrap, (pixman_trap_t *) traps); -+ if (!(image = image_from_pict (pPicture, FALSE))) -+ return; -+ -+ pixman_add_traps(image, x_off, y_off, -+ ntrap, (pixman_trap_t *)traps); - - free_pixman_pict(pPicture, image); - } -@@ -52,13 +51,12 @@ fbRasterizeTrapezoid(PicturePtr pPicture, - xTrapezoid * trap, int x_off, int y_off) - { - pixman_image_t *image; -- int dst_xoff, dst_yoff; - -- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff))) -+ if (!(image = image_from_pict (pPicture, FALSE))) - return; - -- pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *) trap, -- x_off + dst_xoff, y_off + dst_yoff); -+ pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *)trap, -+ x_off, y_off); - - free_pixman_pict(pPicture, image); - } -@@ -68,14 +66,12 @@ fbAddTriangles(PicturePtr pPicture, - INT16 x_off, INT16 y_off, int ntri, xTriangle * tris) - { - pixman_image_t *image; -- int dst_xoff, dst_yoff; - -- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff))) -+ if (!(image = image_from_pict (pPicture, FALSE))) - return; -- -- pixman_add_triangles(image, -- dst_xoff + x_off, dst_yoff + y_off, -- ntri, (pixman_triangle_t *) tris); -+ -+ pixman_add_triangles(image, x_off, y_off, ntri, -+ (pixman_triangle_t *)tris); - - free_pixman_pict(pPicture, image); - } -@@ -98,13 +94,11 @@ fbShapes(CompositeShapesFunc composite, - int16_t ySrc, int nshapes, int shape_size, const uint8_t * shapes) - { - pixman_image_t *src, *dst; -- int src_xoff, src_yoff; -- int dst_xoff, dst_yoff; - - miCompositeSourceValidate(pSrc); - -- src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff); -- dst = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff); -+ src = image_from_pict(pSrc, FALSE); -+ dst = image_from_pict(pDst, TRUE); - - if (src && dst) { - pixman_format_code_t format; -@@ -121,9 +115,8 @@ fbShapes(CompositeShapesFunc composite, - - for (i = 0; i < nshapes; ++i) { - composite(op, src, dst, format, -- xSrc + src_xoff, -- ySrc + src_yoff, -- dst_xoff, dst_yoff, 1, shapes + i * shape_size); -+ xSrc, ySrc, 0, 0, -+ 1, shapes + i * shape_size); - } - } - else { -@@ -143,8 +136,8 @@ fbShapes(CompositeShapesFunc composite, - } - - composite(op, src, dst, format, -- xSrc + src_xoff, -- ySrc + src_yoff, dst_xoff, dst_yoff, nshapes, shapes); -+ xSrc, ySrc, 0, 0, -+ nshapes, shapes); - } - - DamageRegionProcessPending(pDst->pDrawable); --- -2.6.3 - Modified: trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch =================================================================== --- trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch 2016-05-04 21:56:51 UTC (rev 148343) +++ trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch 2016-05-04 22:56:44 UTC (rev 148344) @@ -1,243 +1,320 @@ -From 2c1194b085622ee5c8484d0a9b0a310a18704132 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sat, 31 May 2014 13:14:20 -0700 -Subject: [PATCH 5004/5004] fb: Revert fb changes that broke XQuartz +From ede0b86e109653af9119013ff56e452346fef826 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston <jeremyhu@apple.com> +Date: Fri, 12 Feb 2010 19:48:52 -0800 +Subject: [PATCH 5004/5005] fb: Revert fb changes that broke XQuartz - http://bugs.freedesktop.org/show_bug.cgi?id=26124 +http://bugs.freedesktop.org/show_bug.cgi?id=26124 -Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0" -Revert "fb: Fix origin of source picture in fbGlyphs" -Revert "fb: Publish fbGlyphs and fbUnrealizeGlyph" +Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5." +Revert "fb: Adjust transform or composite coordinates for pixman operations" -This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366. -This reverts commit 983e30361f49a67252d0b5d82630e70724d69dbf. -This reverts commit 3c2c59eed3c68c0e5a93c38cf01eedad015e3157. +http://bugs.freedesktop.org/26124 + +This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695. +This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1. + +Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> --- - fb/fb.h | 3 -- - fb/fbpict.c | 149 +--------------------------------------------------------- - fb/fbpict.h | 11 +---- - fb/fbscreen.c | 1 - - 4 files changed, 2 insertions(+), 162 deletions(-) + fb/fb.h | 3 +-- + fb/fbpict.c | 82 ++++++++++++++++++------------------------------------------- + fb/fbtrap.c | 43 ++++++++++++++------------------ + 3 files changed, 43 insertions(+), 85 deletions(-) diff --git a/fb/fb.h b/fb/fb.h -index 256a1ee..8e87498 100644 +index c687aa7..256a1ee 100644 --- a/fb/fb.h +++ b/fb/fb.h -@@ -1111,9 +1111,6 @@ extern _X_EXPORT void - extern _X_EXPORT Bool - fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats); +@@ -1321,8 +1321,7 @@ fbFillRegionSolid(DrawablePtr pDrawable, + RegionPtr pRegion, FbBits and, FbBits xor); --extern _X_EXPORT void --fbDestroyGlyphCache(void); -- - /* - * fbpixmap.c - */ + extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict, +- Bool has_clip, +- int *xoff, int *yoff); ++ Bool has_clip); + + extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *); + diff --git a/fb/fbpict.c b/fb/fbpict.c -index be8274b..66dd633 100644 +index 434d890..be8274b 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c -@@ -65,152 +65,6 @@ fbComposite(CARD8 op, - free_pixman_pict(pDst, dest); +@@ -46,23 +46,18 @@ fbComposite(CARD8 op, + INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height) + { + pixman_image_t *src, *mask, *dest; +- int src_xoff, src_yoff; +- int msk_xoff, msk_yoff; +- int dst_xoff, dst_yoff; +- + miCompositeSourceValidate(pSrc); + if (pMask) + miCompositeSourceValidate(pMask); + +- src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff); +- mask = image_from_pict(pMask, FALSE, &msk_xoff, &msk_yoff); +- dest = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff); ++ src = image_from_pict(pSrc, TRUE); ++ mask = image_from_pict(pMask, TRUE); ++ dest = image_from_pict(pDst, TRUE); + + if (src && dest && !(pMask && !mask)) { + pixman_image_composite(op, src, mask, dest, +- xSrc + src_xoff, ySrc + src_yoff, +- xMask + msk_xoff, yMask + msk_yoff, +- xDst + dst_xoff, yDst + dst_yoff, width, height); ++ xSrc, ySrc, xMask, yMask, xDst, yDst, ++ width, height); + } + + free_pixman_pict(pSrc, src); +@@ -289,20 +284,22 @@ create_conical_gradient_image(PictGradient * gradient) } --static pixman_glyph_cache_t *glyphCache; + static pixman_image_t * +-create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) ++create_bits_picture(PicturePtr pict, Bool has_clip) + { +- PixmapPtr pixmap; + FbBits *bits; + FbStride stride; +- int bpp; ++ int bpp, xoff, yoff; + pixman_image_t *image; + +- fbGetDrawablePixmap(pict->pDrawable, pixmap, *xoff, *yoff); +- fbGetPixmapBitsData(pixmap, bits, stride, bpp); ++ fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff); ++ ++ bits = (FbBits*)((CARD8*)bits + ++ (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) + ++ (pict->pDrawable->x + xoff) * (bpp / 8)); + + image = pixman_image_create_bits((pixman_format_code_t) pict->format, +- pixmap->drawable.width, +- pixmap->drawable.height, (uint32_t *) bits, ++ pict->pDrawable->width, ++ pict->pDrawable->height, (uint32_t *) bits, + stride * sizeof(FbStride)); + + if (!image) +@@ -321,28 +318,21 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) + if (pict->clientClip) + pixman_image_set_has_client_clip(image, TRUE); + +- if (*xoff || *yoff) +- pixman_region_translate(pict->pCompositeClip, *xoff, *yoff); ++ pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y); + + pixman_image_set_clip_region(image, pict->pCompositeClip); + +- if (*xoff || *yoff) +- pixman_region_translate(pict->pCompositeClip, -*xoff, -*yoff); ++ pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y); + } + + /* Indexed table */ + if (pict->pFormat->index.devPrivate) + pixman_image_set_indexed(image, pict->pFormat->index.devPrivate); + +- /* Add in drawable origin to position within the image */ +- *xoff += pict->pDrawable->x; +- *yoff += pict->pDrawable->y; - --void --fbDestroyGlyphCache(void) --{ -- if (glyphCache) -- { -- pixman_glyph_cache_destroy (glyphCache); -- glyphCache = NULL; -- } --} + return image; + } + + static pixman_image_t *image_from_pict_internal(PicturePtr pict, Bool has_clip, +- int *xoff, int *yoff, + Bool is_alpha_map); + + static void image_destroy(pixman_image_t *image, void *data) +@@ -351,32 +341,13 @@ static void image_destroy(pixman_image_t *image, void *data) + } + + static void +-set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip, +- int *xoff, int *yoff, Bool is_alpha_map) ++set_image_properties(pixman_image_t * image, PicturePtr pict, Bool is_alpha_map) + { + pixman_repeat_t repeat; + pixman_filter_t filter; + + if (pict->transform) { +- /* For source images, adjust the transform to account +- * for the drawable offset within the pixman image, +- * then set the offset to 0 as it will be used +- * to compute positions within the transformed image. +- */ +- if (!has_clip) { +- struct pixman_transform adjusted; - --static void --fbUnrealizeGlyph(ScreenPtr pScreen, -- GlyphPtr pGlyph) --{ -- if (glyphCache) -- pixman_glyph_cache_remove (glyphCache, pGlyph, NULL); --} +- adjusted = *pict->transform; +- pixman_transform_translate(&adjusted, +- NULL, +- pixman_int_to_fixed(*xoff), +- pixman_int_to_fixed(*yoff)); +- pixman_image_set_transform(image, &adjusted); +- *xoff = 0; +- *yoff = 0; +- } +- else +- pixman_image_set_transform(image, pict->transform); ++ pixman_image_set_transform(image, pict->transform); + } + + switch (pict->repeatType) { +@@ -404,10 +375,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip, + * as the alpha map for this operation + */ + if (pict->alphaMap && !is_alpha_map) { +- int alpha_xoff, alpha_yoff; + pixman_image_t *alpha_map = +- image_from_pict_internal(pict->alphaMap, FALSE, &alpha_xoff, +- &alpha_yoff, TRUE); ++ image_from_pict_internal(pict->alphaMap, TRUE, TRUE); + + pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x, + pict->alphaOrigin.y); +@@ -445,8 +414,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip, + } + + static pixman_image_t * +-image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff, +- Bool is_alpha_map) ++image_from_pict_internal(PicturePtr pict, Bool has_clip, Bool is_alpha_map) + { + pixman_image_t *image = NULL; + +@@ -454,7 +422,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff, + return NULL; + + if (pict->pDrawable) { +- image = create_bits_picture(pict, has_clip, xoff, yoff); ++ image = create_bits_picture(pict, has_clip); + } + else if (pict->pSourcePict) { + SourcePict *sp = pict->pSourcePict; +@@ -472,19 +440,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff, + else if (sp->type == SourcePictTypeConical) + image = create_conical_gradient_image(gradient); + } +- *xoff = *yoff = 0; + } + + if (image) +- set_image_properties(image, pict, has_clip, xoff, yoff, is_alpha_map); - --void --fbGlyphs(CARD8 op, -- PicturePtr pSrc, -- PicturePtr pDst, -- PictFormatPtr maskFormat, -- INT16 xSrc, -- INT16 ySrc, int nlist, -- GlyphListPtr list, -- GlyphPtr *glyphs) --{ --#define N_STACK_GLYPHS 512 -- ScreenPtr pScreen = pDst->pDrawable->pScreen; -- pixman_glyph_t stack_glyphs[N_STACK_GLYPHS]; -- pixman_glyph_t *pglyphs = stack_glyphs; -- pixman_image_t *srcImage, *dstImage; -- int srcXoff, srcYoff, dstXoff, dstYoff; -- GlyphPtr glyph; -- int n_glyphs; -- int x, y; -- int i, n; -- int xDst = list->xOff, yDst = list->yOff; ++ set_image_properties (image, pict, is_alpha_map); + return image; + } + + pixman_image_t * +-image_from_pict(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) ++image_from_pict (PicturePtr pict, Bool has_clip) + { +- return image_from_pict_internal(pict, has_clip, xoff, yoff, FALSE); ++ return image_from_pict_internal (pict, has_clip, FALSE); + } + + void +diff --git a/fb/fbtrap.c b/fb/fbtrap.c +index bf82f8f..0145ce9 100644 +--- a/fb/fbtrap.c ++++ b/fb/fbtrap.c +@@ -36,13 +36,12 @@ fbAddTraps(PicturePtr pPicture, + INT16 x_off, INT16 y_off, int ntrap, xTrap * traps) + { + pixman_image_t *image; +- int dst_xoff, dst_yoff; + +- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff))) +- return; - -- miCompositeSourceValidate(pSrc); -- -- n_glyphs = 0; -- for (i = 0; i < nlist; ++i) -- n_glyphs += list[i].len; -- -- if (!glyphCache) -- glyphCache = pixman_glyph_cache_create(); -- -- pixman_glyph_cache_freeze (glyphCache); -- -- if (n_glyphs > N_STACK_GLYPHS) { -- if (!(pglyphs = xallocarray(n_glyphs, sizeof(pixman_glyph_t)))) -- goto out; -- } -- -- i = 0; -- x = y = 0; -- while (nlist--) { -- x += list->xOff; -- y += list->yOff; -- n = list->len; -- while (n--) { -- const void *g; -- -- glyph = *glyphs++; -- -- if (!(g = pixman_glyph_cache_lookup (glyphCache, glyph, NULL))) { -- pixman_image_t *glyphImage; -- PicturePtr pPicture; -- int xoff, yoff; -- -- pPicture = GetGlyphPicture(glyph, pScreen); -- if (!pPicture) { -- n_glyphs--; -- goto next; -- } -- -- if (!(glyphImage = image_from_pict(pPicture, FALSE, &xoff, &yoff))) -- goto out; -- -- g = pixman_glyph_cache_insert(glyphCache, glyph, NULL, -- glyph->info.x, -- glyph->info.y, -- glyphImage); -- -- free_pixman_pict(pPicture, glyphImage); -- -- if (!g) -- goto out; -- } -- -- pglyphs[i].x = x; -- pglyphs[i].y = y; -- pglyphs[i].glyph = g; -- i++; -- -- next: -- x += glyph->info.xOff; -- y += glyph->info.yOff; -- } -- list++; -- } -- -- if (!(srcImage = image_from_pict(pSrc, FALSE, &srcXoff, &srcYoff))) -- goto out; -- -- if (!(dstImage = image_from_pict(pDst, TRUE, &dstXoff, &dstYoff))) -- goto out_free_src; -- -- if (maskFormat) { -- pixman_format_code_t format; -- pixman_box32_t extents; -- -- format = maskFormat->format | (maskFormat->depth << 24); -- -- pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents); -- -- pixman_composite_glyphs(op, srcImage, dstImage, format, -- xSrc + srcXoff + extents.x1 - xDst, ySrc + srcYoff + extents.y1 - yDst, -- extents.x1, extents.y1, -- extents.x1 + dstXoff, extents.y1 + dstYoff, -- extents.x2 - extents.x1, -- extents.y2 - extents.y1, -- glyphCache, n_glyphs, pglyphs); -- } -- else { -- pixman_composite_glyphs_no_mask(op, srcImage, dstImage, -- xSrc + srcXoff - xDst, ySrc + srcYoff - yDst, -- dstXoff, dstYoff, -- glyphCache, n_glyphs, pglyphs); -- } -- -- free_pixman_pict(pDst, dstImage); -- --out_free_src: -- free_pixman_pict(pSrc, srcImage); -- --out: -- pixman_glyph_cache_thaw(glyphCache); -- if (pglyphs != stack_glyphs) -- free(pglyphs); --} -- - static pixman_image_t * - create_solid_fill_image(PicturePtr pict) +- pixman_add_traps(image, x_off + dst_xoff, y_off + dst_yoff, +- ntrap, (pixman_trap_t *) traps); ++ if (!(image = image_from_pict (pPicture, FALSE))) ++ return; ++ ++ pixman_add_traps(image, x_off, y_off, ++ ntrap, (pixman_trap_t *)traps); + + free_pixman_pict(pPicture, image); + } +@@ -52,13 +51,12 @@ fbRasterizeTrapezoid(PicturePtr pPicture, + xTrapezoid * trap, int x_off, int y_off) { -@@ -470,8 +324,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) - return FALSE; - ps = GetPictureScreen(pScreen); - ps->Composite = fbComposite; -- ps->Glyphs = fbGlyphs; -- ps->UnrealizeGlyph = fbUnrealizeGlyph; -+ ps->Glyphs = miGlyphs; - ps->CompositeRects = miCompositeRects; - ps->RasterizeTrapezoid = fbRasterizeTrapezoid; - ps->AddTraps = fbAddTraps; -diff --git a/fb/fbpict.h b/fb/fbpict.h -index 5cb8663..110f32d 100644 ---- a/fb/fbpict.h -+++ b/fb/fbpict.h -@@ -65,20 +65,11 @@ fbTrapezoids(CARD8 op, - INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps); + pixman_image_t *image; +- int dst_xoff, dst_yoff; - extern _X_EXPORT void -+ - fbTriangles(CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris); +- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff))) ++ if (!(image = image_from_pict (pPicture, FALSE))) + return; --extern _X_EXPORT void --fbGlyphs(CARD8 op, -- PicturePtr pSrc, -- PicturePtr pDst, -- PictFormatPtr maskFormat, -- INT16 xSrc, -- INT16 ySrc, int nlist, -- GlyphListPtr list, -- GlyphPtr *glyphs); +- pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *) trap, +- x_off + dst_xoff, y_off + dst_yoff); ++ pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *)trap, ++ x_off, y_off); + + free_pixman_pict(pPicture, image); + } +@@ -68,14 +66,12 @@ fbAddTriangles(PicturePtr pPicture, + INT16 x_off, INT16 y_off, int ntri, xTriangle * tris) + { + pixman_image_t *image; +- int dst_xoff, dst_yoff; + +- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff))) ++ if (!(image = image_from_pict (pPicture, FALSE))) + return; - - #endif /* _FBPICT_H_ */ -diff --git a/fb/fbscreen.c b/fb/fbscreen.c -index 71bcc5d..55330fc 100644 ---- a/fb/fbscreen.c -+++ b/fb/fbscreen.c -@@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen) - int d; - DepthPtr depths = pScreen->allowedDepths; +- pixman_add_triangles(image, +- dst_xoff + x_off, dst_yoff + y_off, +- ntri, (pixman_triangle_t *) tris); ++ ++ pixman_add_triangles(image, x_off, y_off, ntri, ++ (pixman_triangle_t *)tris); -- fbDestroyGlyphCache(); - for (d = 0; d < pScreen->numDepths; d++) - free(depths[d].vids); - free(depths); + free_pixman_pict(pPicture, image); + } +@@ -98,13 +94,11 @@ fbShapes(CompositeShapesFunc composite, + int16_t ySrc, int nshapes, int shape_size, const uint8_t * shapes) + { + pixman_image_t *src, *dst; +- int src_xoff, src_yoff; +- int dst_xoff, dst_yoff; + + miCompositeSourceValidate(pSrc); + +- src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff); +- dst = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff); ++ src = image_from_pict(pSrc, FALSE); ++ dst = image_from_pict(pDst, TRUE); + + if (src && dst) { + pixman_format_code_t format; +@@ -121,9 +115,8 @@ fbShapes(CompositeShapesFunc composite, + + for (i = 0; i < nshapes; ++i) { + composite(op, src, dst, format, +- xSrc + src_xoff, +- ySrc + src_yoff, +- dst_xoff, dst_yoff, 1, shapes + i * shape_size); ++ xSrc, ySrc, 0, 0, ++ 1, shapes + i * shape_size); + } + } + else { +@@ -143,8 +136,8 @@ fbShapes(CompositeShapesFunc composite, + } + + composite(op, src, dst, format, +- xSrc + src_xoff, +- ySrc + src_yoff, dst_xoff, dst_yoff, nshapes, shapes); ++ xSrc, ySrc, 0, 0, ++ nshapes, shapes); + } + + DamageRegionProcessPending(pDst->pDrawable); -- -2.6.3 +2.8.1 Added: trunk/dports/x11/xorg-server-devel/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch =================================================================== --- trunk/dports/x11/xorg-server-devel/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch (rev 0) +++ trunk/dports/x11/xorg-server-devel/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch 2016-05-04 22:56:44 UTC (rev 148344) @@ -0,0 +1,243 @@ +From 33dd8bad4b6a018d1bbe66b6e6de972c58cfc9f1 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sat, 31 May 2014 13:14:20 -0700 +Subject: [PATCH 5005/5005] fb: Revert fb changes that broke XQuartz + + http://bugs.freedesktop.org/show_bug.cgi?id=26124 + +Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0" +Revert "fb: Fix origin of source picture in fbGlyphs" +Revert "fb: Publish fbGlyphs and fbUnrealizeGlyph" + +This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366. +This reverts commit 983e30361f49a67252d0b5d82630e70724d69dbf. +This reverts commit 3c2c59eed3c68c0e5a93c38cf01eedad015e3157. +--- + fb/fb.h | 3 -- + fb/fbpict.c | 149 +--------------------------------------------------------- + fb/fbpict.h | 11 +---- + fb/fbscreen.c | 1 - + 4 files changed, 2 insertions(+), 162 deletions(-) + +diff --git a/fb/fb.h b/fb/fb.h +index 256a1ee..8e87498 100644 +--- a/fb/fb.h ++++ b/fb/fb.h +@@ -1111,9 +1111,6 @@ extern _X_EXPORT void + extern _X_EXPORT Bool + fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats); + +-extern _X_EXPORT void +-fbDestroyGlyphCache(void); +- + /* + * fbpixmap.c + */ +diff --git a/fb/fbpict.c b/fb/fbpict.c +index be8274b..66dd633 100644 +--- a/fb/fbpict.c ++++ b/fb/fbpict.c +@@ -65,152 +65,6 @@ fbComposite(CARD8 op, + free_pixman_pict(pDst, dest); + } + +-static pixman_glyph_cache_t *glyphCache; +- +-void +-fbDestroyGlyphCache(void) +-{ +- if (glyphCache) +- { +- pixman_glyph_cache_destroy (glyphCache); +- glyphCache = NULL; +- } +-} +- +-static void +-fbUnrealizeGlyph(ScreenPtr pScreen, +- GlyphPtr pGlyph) +-{ +- if (glyphCache) +- pixman_glyph_cache_remove (glyphCache, pGlyph, NULL); +-} +- +-void +-fbGlyphs(CARD8 op, +- PicturePtr pSrc, +- PicturePtr pDst, +- PictFormatPtr maskFormat, +- INT16 xSrc, +- INT16 ySrc, int nlist, +- GlyphListPtr list, +- GlyphPtr *glyphs) +-{ +-#define N_STACK_GLYPHS 512 +- ScreenPtr pScreen = pDst->pDrawable->pScreen; +- pixman_glyph_t stack_glyphs[N_STACK_GLYPHS]; +- pixman_glyph_t *pglyphs = stack_glyphs; +- pixman_image_t *srcImage, *dstImage; +- int srcXoff, srcYoff, dstXoff, dstYoff; +- GlyphPtr glyph; +- int n_glyphs; +- int x, y; +- int i, n; +- int xDst = list->xOff, yDst = list->yOff; +- +- miCompositeSourceValidate(pSrc); +- +- n_glyphs = 0; +- for (i = 0; i < nlist; ++i) +- n_glyphs += list[i].len; +- +- if (!glyphCache) +- glyphCache = pixman_glyph_cache_create(); +- +- pixman_glyph_cache_freeze (glyphCache); +- +- if (n_glyphs > N_STACK_GLYPHS) { +- if (!(pglyphs = xallocarray(n_glyphs, sizeof(pixman_glyph_t)))) +- goto out; +- } +- +- i = 0; +- x = y = 0; +- while (nlist--) { +- x += list->xOff; +- y += list->yOff; +- n = list->len; +- while (n--) { +- const void *g; +- +- glyph = *glyphs++; +- +- if (!(g = pixman_glyph_cache_lookup (glyphCache, glyph, NULL))) { +- pixman_image_t *glyphImage; +- PicturePtr pPicture; +- int xoff, yoff; +- +- pPicture = GetGlyphPicture(glyph, pScreen); +- if (!pPicture) { +- n_glyphs--; +- goto next; +- } +- +- if (!(glyphImage = image_from_pict(pPicture, FALSE, &xoff, &yoff))) +- goto out; +- +- g = pixman_glyph_cache_insert(glyphCache, glyph, NULL, +- glyph->info.x, +- glyph->info.y, +- glyphImage); +- +- free_pixman_pict(pPicture, glyphImage); +- +- if (!g) +- goto out; +- } +- +- pglyphs[i].x = x; +- pglyphs[i].y = y; +- pglyphs[i].glyph = g; +- i++; +- +- next: +- x += glyph->info.xOff; +- y += glyph->info.yOff; +- } +- list++; +- } +- +- if (!(srcImage = image_from_pict(pSrc, FALSE, &srcXoff, &srcYoff))) +- goto out; +- +- if (!(dstImage = image_from_pict(pDst, TRUE, &dstXoff, &dstYoff))) +- goto out_free_src; +- +- if (maskFormat) { +- pixman_format_code_t format; +- pixman_box32_t extents; +- +- format = maskFormat->format | (maskFormat->depth << 24); +- +- pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents); +- +- pixman_composite_glyphs(op, srcImage, dstImage, format, +- xSrc + srcXoff + extents.x1 - xDst, ySrc + srcYoff + extents.y1 - yDst, +- extents.x1, extents.y1, +- extents.x1 + dstXoff, extents.y1 + dstYoff, +- extents.x2 - extents.x1, +- extents.y2 - extents.y1, +- glyphCache, n_glyphs, pglyphs); +- } +- else { +- pixman_composite_glyphs_no_mask(op, srcImage, dstImage, +- xSrc + srcXoff - xDst, ySrc + srcYoff - yDst, +- dstXoff, dstYoff, +- glyphCache, n_glyphs, pglyphs); +- } +- +- free_pixman_pict(pDst, dstImage); +- +-out_free_src: +- free_pixman_pict(pSrc, srcImage); +- +-out: +- pixman_glyph_cache_thaw(glyphCache); +- if (pglyphs != stack_glyphs) +- free(pglyphs); +-} +- + static pixman_image_t * + create_solid_fill_image(PicturePtr pict) + { +@@ -470,8 +324,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) + return FALSE; + ps = GetPictureScreen(pScreen); + ps->Composite = fbComposite; +- ps->Glyphs = fbGlyphs; +- ps->UnrealizeGlyph = fbUnrealizeGlyph; ++ ps->Glyphs = miGlyphs; + ps->CompositeRects = miCompositeRects; + ps->RasterizeTrapezoid = fbRasterizeTrapezoid; + ps->AddTraps = fbAddTraps; +diff --git a/fb/fbpict.h b/fb/fbpict.h +index 5cb8663..110f32d 100644 +--- a/fb/fbpict.h ++++ b/fb/fbpict.h +@@ -65,20 +65,11 @@ fbTrapezoids(CARD8 op, + INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps); + + extern _X_EXPORT void ++ + fbTriangles(CARD8 op, + PicturePtr pSrc, + PicturePtr pDst, + PictFormatPtr maskFormat, + INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris); + +-extern _X_EXPORT void +-fbGlyphs(CARD8 op, +- PicturePtr pSrc, +- PicturePtr pDst, +- PictFormatPtr maskFormat, +- INT16 xSrc, +- INT16 ySrc, int nlist, +- GlyphListPtr list, +- GlyphPtr *glyphs); +- + #endif /* _FBPICT_H_ */ +diff --git a/fb/fbscreen.c b/fb/fbscreen.c +index 71bcc5d..55330fc 100644 +--- a/fb/fbscreen.c ++++ b/fb/fbscreen.c +@@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen) + int d; + DepthPtr depths = pScreen->allowedDepths; + +- fbDestroyGlyphCache(); + for (d = 0; d < pScreen->numDepths; d++) + free(depths[d].vids); + free(depths); +-- +2.8.1 +