diff options
| author | Keith Packard <keithp@guitar.keithp.com> | 2007-03-17 21:32:36 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@guitar.keithp.com> | 2007-03-17 21:32:36 -0700 |
| commit | 62a5399d70ac3f8579441d617f8d80c94942a32a (patch) | |
| tree | abe481355263978b00e3e1f46a13a5cf55823079 /src/i830_dri.c | |
| parent | 05e0021147a89254182c277007236448f315231c (diff) | |
Elide I830DRIClipNotify for older DRI versions.
I830DRIClipNotify is passed to newer versions of DRI; don't include it in
the server when building against older versions.
Diffstat (limited to 'src/i830_dri.c')
| -rw-r--r-- | src/i830_dri.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index b24c8391..0fcce58c 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -126,7 +126,14 @@ 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) +#define DRI_SUPPORTS_CLIP_NOTIFY 1 +#endif + +#ifdef DRI_SUPPORTS_CLIP_NOTIFY static void I830DRIClipNotify(ScreenPtr pScreen, WindowPtr *ppWin, int num); +#endif extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig * configs, @@ -576,8 +583,7 @@ I830DRIScreenInit(ScreenPtr pScreen) if (minor >= 1) #endif -#if DRIINFO_MAJOR_VERSION > 5 || \ - (DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 1) +#if DRI_SUPPORTS_CLIP_NOTIFY pDRIInfo->ClipNotify = I830DRIClipNotify; #endif } @@ -1547,6 +1553,7 @@ I830DRITransitionTo2d(ScreenPtr pScreen) sPriv->pf_enabled = 0; } +#if DRI_SUPPORTS_CLIP_NOTIFY static void I830DRIClipNotify(ScreenPtr pScreen, WindowPtr *ppWin, int num) { @@ -1595,7 +1602,7 @@ I830DRIClipNotify(ScreenPtr pScreen, WindowPtr *ppWin, int num) I830DRISetPfMask(pScreen, pfMask); } - +#endif /* DRI_SUPPORTS_CLIP_NOTIFY */ /** * Update the SAREA fields with the most recent values. |