diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 08:57:22 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 08:57:22 +0000 |
| commit | d2bf55b405ea8f980984aab4be7d4b878c9e6981 (patch) | |
| tree | 676ad441e287f6de1950260c3d2ef0b720f69bad /xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h | |
| parent | a46e26df6103fb0e6e00d8d11d58c3f7a358208c (diff) | |
| download | vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.gz vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.bz2 vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.zip | |
git update 22/4/2010
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h index 40d436856..9b4a59731 100644 --- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h +++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h @@ -43,9 +43,7 @@ #include "xf86str.h" #include "mipointer.h" #include "mipointrst.h" -#ifdef RENDER # include "picturestr.h" -#endif #define WRAP_SCREEN(x,y) {pScreenPriv->x = pScreen->x; pScreen->x = y;} @@ -139,11 +137,9 @@ typedef struct _VGAarbiterScreen { void (*LeaveVT)(int, int); void (*FreeScreen)(int, int); miPointerSpriteFuncPtr miSprite; -#ifdef RENDER CompositeProcPtr Composite; GlyphsProcPtr Glyphs; CompositeRectsProcPtr CompositeRects; -#endif } VGAarbiterScreenRec, *VGAarbiterScreenPtr; typedef struct _VGAarbiterGC { @@ -254,7 +250,6 @@ static Bool VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScree static void VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen); -#ifdef RENDER static void VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height); @@ -263,4 +258,3 @@ static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, list, GlyphPtr *glyphs); static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects); -#endif |