diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-08-29 14:48:44 -0300 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-08-29 19:50:17 -0300 |
| commit | 96166eafc2b0e5db627aa4f8b0422f953837772b (patch) | |
| tree | 3c7997609e5da12c2f92009baecea00e9cbfbd9d /src/smi_video.c | |
| parent | 682b9a1b97a82c7d084c63860a8c753cc45d9faf (diff) | |
Fix build for removal of xf86Version.h
This is the first patch of series to merge code from the version 2.2.5
from SiliconMotion and code from
http://cgit.freedesktop.org/~agd5f/xf86-video-smi501
After the merge, work will continue, to correct some extra problems,
and make it work with EXA at least (as only the Xorg version has
EXA support).
Diffstat (limited to 'src/smi_video.c')
| -rw-r--r-- | src/smi_video.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/smi_video.c b/src/smi_video.c index 4385583..b1fea46 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -66,7 +66,11 @@ The default value can be set with the driver option Interlaced */ - +#ifdef XF86_VERSION_CURRENT +# if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,0,0) +# define REGION_EQUAL(pScreen, r1, r2) RegionsEqual(r1, r2)) +# endif +#endif #undef MIN #undef ABS @@ -1223,11 +1227,7 @@ SMI_PutVideo( vid_address = pPort->video_offset; DEBUG((VERBLEV, "test RegionsEqual\n")); -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,0,0) - if (!RegionsEqual(&pPort->clip, clipBoxes)) -#else if (!REGION_EQUAL(pScrn->pScreen, &pPort->clip, clipBoxes)) -#endif { DEBUG((VERBLEV, "RegionCopy\n")); REGION_COPY(pScrn->pScreen, &pPort->clip, clipBoxes); @@ -1620,11 +1620,7 @@ SMI_PutImage( break; } -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,0,0) - if (!RegionsEqual(&pPort->clip, clipBoxes)) -#else if (!REGION_EQUAL(pScrn->pScreen, &pPort->clip, clipBoxes)) -#endif { REGION_COPY(pScrn->pScreen, &pPort->clip, clipBoxes); xf86XVFillKeyHelper(pScrn->pScreen, pPort->Attribute[XV_COLORKEY], |