diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-19 10:45:58 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-19 10:45:58 +0100 |
| commit | c21b88d838fda1f00f6f6bcfe7855d32543c6f3f (patch) | |
| tree | 30960020da1444c2cf8420923bcb9b5ca43a21fa /src/i830_dri.c | |
| parent | 991719c21a6cc1b5d9b7cbe30d4b333718b3e686 (diff) | |
Fix build when DAMAGE is not defined.
Diffstat (limited to 'src/i830_dri.c')
| -rw-r--r-- | src/i830_dri.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index 0fcce58c..ccc1faca 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -126,8 +126,8 @@ static void I830DRITransitionTo2d(ScreenPtr pScreen); static void I830DRITransitionTo3d(ScreenPtr pScreen); static void I830DRITransitionMultiToSingle3d(ScreenPtr pScreen); static void I830DRITransitionSingleToMulti3d(ScreenPtr pScreen); -#if DRIINFO_MAJOR_VERSION > 5 || \ - (DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 1) +#if defined(DAMAGE) && (DRIINFO_MAJOR_VERSION > 5 || \ + (DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 1)) #define DRI_SUPPORTS_CLIP_NOTIFY 1 #endif @@ -576,7 +576,8 @@ I830DRIScreenInit(ScreenPtr pScreen) pDRIInfo->bufferRequests = DRI_ALL_WINDOWS; { -#if DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 1 +#if DRI_SUPPORTS_CLIP_NOTIFY && DRIINFO_MAJOR_VERSION == 5 && \ + DRIINFO_MINOR_VERSION >= 1 int major, minor, patch; DRIQueryVersion(&major, &minor, &patch); @@ -1200,7 +1201,9 @@ I830DRISwapContext(ScreenPtr pScreen, DRISyncType syncType, } else if (syncType == DRI_2D_SYNC && oldContextType == DRI_NO_CONTEXT && newContextType == DRI_2D_CONTEXT) { +#ifdef DAMAGE drmI830Sarea *sPriv = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen); +#endif if (I810_DEBUG & DEBUG_VERBOSE_DRI) ErrorF("i830DRISwapContext (out)\n"); |