aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-12-01 06:54:34 +0000
committermarha <marha@users.sourceforge.net>2010-12-01 06:54:34 +0000
commit30eaf03aef5847adb6da7efd4bbf4a4abaf5d738 (patch)
tree9096dda170059f36806901aee59b8cf2a839a9e9 /xorg-server/hw/xquartz
parent57818d0fe4f7cf94279909f03ec11b326b284f1e (diff)
downloadvcxsrv-30eaf03aef5847adb6da7efd4bbf4a4abaf5d738.tar.gz
vcxsrv-30eaf03aef5847adb6da7efd4bbf4a4abaf5d738.tar.bz2
vcxsrv-30eaf03aef5847adb6da7efd4bbf4a4abaf5d738.zip
xserver libX11 libxcb update 1/12/2010
Diffstat (limited to 'xorg-server/hw/xquartz')
-rw-r--r--xorg-server/hw/xquartz/GL/indirect.c2
-rw-r--r--xorg-server/hw/xquartz/darwin.c22
2 files changed, 0 insertions, 24 deletions
diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c
index 718727ebe..3edf25d24 100644
--- a/xorg-server/hw/xquartz/GL/indirect.c
+++ b/xorg-server/hw/xquartz/GL/indirect.c
@@ -586,8 +586,6 @@ static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
screen->base.createContext = __glXAquaScreenCreateContext;
screen->base.createDrawable = __glXAquaScreenCreateDrawable;
screen->base.swapInterval = /*FIXME*/ NULL;
- screen->base.hyperpipeFuncs = NULL;
- screen->base.swapBarrierFuncs = NULL;
screen->base.pScreen = pScreen;
screen->base.fbconfigs = __glXAquaCreateVisualConfigs(&screen->base.numFBConfigs, pScreen->myNum);
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index f217f4c33..4dbe74b97 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -868,28 +868,6 @@ xf86SetRootClip (ScreenPtr pScreen, int enable)
(*pScreen->ValidateTree)(pWin, NullWindow, VTOther);
}
- if (pWin->backStorage &&
- ((pWin->backingStore == Always) || WasViewable))
- {
- if (!WasViewable)
- pOldClip = &pWin->clipList; /* a convenient empty region */
- bsExposed = (*pScreen->TranslateBackingStore)
- (pWin, 0, 0, pOldClip,
- pWin->drawable.x, pWin->drawable.y);
- if (WasViewable)
- RegionDestroy(pOldClip);
- if (bsExposed)
- {
- RegionPtr valExposed = NullRegion;
-
- if (pWin->valdata)
- valExposed = &pWin->valdata->after.exposed;
- (*pScreen->WindowExposures) (pWin, valExposed, bsExposed);
- if (valExposed)
- RegionEmpty(valExposed);
- RegionDestroy(bsExposed);
- }
- }
if (WasViewable)
{
if (anyMarked)