diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
| commit | 2446c474aae15bcaf31e4b799f94f21d515984d5 (patch) | |
| tree | 31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/hw/xfree86/xaa/xaa.h | |
| parent | 0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff) | |
| download | vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2 vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip | |
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xfree86/xaa/xaa.h')
| -rw-r--r-- | xorg-server/hw/xfree86/xaa/xaa.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/xorg-server/hw/xfree86/xaa/xaa.h b/xorg-server/hw/xfree86/xaa/xaa.h index 7db6b95d5..2af954fee 100644 --- a/xorg-server/hw/xfree86/xaa/xaa.h +++ b/xorg-server/hw/xfree86/xaa/xaa.h @@ -108,9 +108,7 @@ #include "regionstr.h" #include "xf86fbman.h" -#ifdef RENDER #include "picturestr.h" -#endif /* Flags */ #define PIXMAP_CACHE 0x00000001 @@ -1251,7 +1249,6 @@ typedef struct _XAAInfoRec { CARD32 FullPlanemasks[32]; -#ifdef RENDER Bool (*Composite) ( CARD8 op, PicturePtr pSrc, @@ -1336,13 +1333,10 @@ typedef struct _XAAInfoRec { CARD32 * CPUToScreenTextureFormats; -#endif - /* these were added for 4.3.0 */ BoxRec SolidLineLimits; BoxRec DashedLineLimits; -#ifdef RENDER /* These were added for X.Org 6.8.0 */ Bool (*SetupForCPUToScreenAlphaTexture2) ( ScrnInfoPtr pScrn, @@ -1373,7 +1367,6 @@ typedef struct _XAAInfoRec { int flags ); CARD32 *CPUToScreenTextureDstFormats; -#endif /* RENDER */ } XAAInfoRec, *XAAInfoRecPtr; #define SET_SYNC_FLAG(infoRec) (infoRec)->NeedToSync = TRUE |