diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-14 14:23:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-14 14:23:04 +0000 |
| commit | 2ddb14008968ea365e3d395487cad2bfe154da9d (patch) | |
| tree | f9d970e9dd6ee1ec835fedcadc15a8705a50e6d5 /xorg-server/hw/xwin | |
| parent | b7a6351e37e788bb25415dc79aaf2718b48d6939 (diff) | |
| parent | 3815190d52f8ae453c2458335394eb5b18ab9bf5 (diff) | |
| download | vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.gz vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.bz2 vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin')
| -rw-r--r-- | xorg-server/hw/xwin/win.h | 10 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/wingc.c | 5 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winscrinit.c | 6 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winwin32rootless.c | 18 |
4 files changed, 0 insertions, 39 deletions
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h index 3649fe830..18148e63c 100644 --- a/xorg-server/hw/xwin/win.h +++ b/xorg-server/hw/xwin/win.h @@ -1348,16 +1348,6 @@ winMWExtWMCopyBytes (unsigned int width, unsigned int height, void *dst, unsigned int dstRowBytes);
void
-winMWExtWMFillBytes (unsigned int width, unsigned int height, unsigned int value,
- void *dst, unsigned int dstRowBytes);
-
-int
-winMWExtWMCompositePixels (unsigned int width, unsigned int height, unsigned int function,
- void *src[2], unsigned int srcRowBytes[2],
- void *mask, unsigned int maskRowBytes,
- void *dst[2], unsigned int dstRowBytes[2]);
-
-void
winMWExtWMCopyWindow (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,
int dx, int dy);
#endif
diff --git a/xorg-server/hw/xwin/wingc.c b/xorg-server/hw/xwin/wingc.c index 5f8b2905e..bf307a44c 100644 --- a/xorg-server/hw/xwin/wingc.c +++ b/xorg-server/hw/xwin/wingc.c @@ -96,11 +96,6 @@ winCreateGCNativeGDI (GCPtr pGC) winDebug ("winCreateGCNativeGDI - depth: %d\n",
pGC->depth);
- pGC->clientClip = NULL;
- pGC->clientClipType = CT_NONE;
- pGC->freeCompClip = FALSE;
- pGC->pCompositeClip = 0;
-
pGC->ops = (GCOps *) &winGCOps;
pGC->funcs = (GCFuncs *) &winGCFuncs;
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c index 5273460a4..e5847453c 100644 --- a/xorg-server/hw/xwin/winscrinit.c +++ b/xorg-server/hw/xwin/winscrinit.c @@ -54,17 +54,13 @@ winMWExtWMProcs = { winMWExtWMStartDrawing,
winMWExtWMStopDrawing,
winMWExtWMUpdateRegion,
-#ifndef ROOTLESS_TRACK_DAMAGE
winMWExtWMDamageRects,
-#endif
winMWExtWMRootlessSwitchWindow,
NULL,//winMWExtWMDoReorderWindow,
NULL,//winMWExtWMHideWindow,
NULL,//winMWExtWMUpdateColorMap,
NULL,//winMWExtWMCopyBytes,
- NULL,//winMWExtWMFillBytes,
- NULL,//winMWExtWMCompositePixels,
winMWExtWMCopyWindow
};
#endif
@@ -456,8 +452,6 @@ winFinishScreenInitFB (int index, winDebug ("winScreenInit - MultiWindowExtWM - RootlessInit returned\n");
rootless_CopyBytes_threshold = 0;
- rootless_FillBytes_threshold = 0;
- rootless_CompositePixels_threshold = 0;
/* FIXME: How many? Profiling needed? */
rootless_CopyWindow_threshold = 1;
diff --git a/xorg-server/hw/xwin/winwin32rootless.c b/xorg-server/hw/xwin/winwin32rootless.c index 862d5ba98..32b124685 100644 --- a/xorg-server/hw/xwin/winwin32rootless.c +++ b/xorg-server/hw/xwin/winwin32rootless.c @@ -906,24 +906,6 @@ winMWExtWMCopyBytes (unsigned int width, unsigned int height, }
void
-winMWExtWMFillBytes (unsigned int width, unsigned int height, unsigned int value,
- void *dst, unsigned int dstRowBytes)
-{
- winDebug ("winMWExtWMFillBytes - Not implemented\n");
-}
-
-int
-winMWExtWMCompositePixels (unsigned int width, unsigned int height, unsigned int function,
- void *src[2], unsigned int srcRowBytes[2],
- void *mask, unsigned int maskRowBytes,
- void *dst[2], unsigned int dstRowBytes[2])
-{
- winDebug ("winMWExtWMCompositePixels - Not implemented\n");
- return 0;
-}
-
-
-void
winMWExtWMCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pDstRects,
int nDx, int nDy)
{
|