diff options
| author | Eric Anholt <eric@anholt.net> | 2006-11-30 09:15:30 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-11-30 09:15:30 -0800 |
| commit | b94b7c4bcfdb7ba59ed818f72309b5060a2ab7ee (patch) | |
| tree | 7c7a6bbfa3d08660c0a986bf59d25a89a9260cee /src/i830_dga.c | |
| parent | b6fc8df9a52f5fe1b4d26ae06bc4d48235b44a67 (diff) | |
| parent | 25e6e497824a23eb231fc6fd6e483f601d612cee (diff) | |
Merge branch 'exa' of ../xf86-video-intel into modesetting
Conflicts:
man/i810.man
src/Makefile.am
src/i830.h
src/i830_driver.c
src/i830_rotate.c
src/i830_video.c
Diffstat (limited to 'src/i830_dga.c')
| -rw-r--r-- | src/i830_dga.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/i830_dga.c b/src/i830_dga.c index 1a6e4e69..b53b667e 100644 --- a/src/i830_dga.c +++ b/src/i830_dga.c @@ -238,6 +238,7 @@ static void I830_FillRect(ScrnInfoPtr pScrn, int x, int y, int w, int h, unsigned long color) { +#ifdef I830_USE_XAA I830Ptr pI830 = I830PTR(pScrn); MARKER(); @@ -247,6 +248,7 @@ I830_FillRect(ScrnInfoPtr pScrn, (*pI830->AccelInfoRec->SubsequentSolidFillRect) (pScrn, x, y, w, h); SET_SYNC_FLAG(pI830->AccelInfoRec); } +#endif } static void @@ -278,6 +280,7 @@ static void I830_BlitRect(ScrnInfoPtr pScrn, int srcx, int srcy, int w, int h, int dstx, int dsty) { +#ifdef I830_USE_XAA I830Ptr pI830 = I830PTR(pScrn); MARKER(); @@ -292,6 +295,7 @@ I830_BlitRect(ScrnInfoPtr pScrn, dstx, dsty, w, h); SET_SYNC_FLAG(pI830->AccelInfoRec); } +#endif } #if 0 |