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_dri.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_dri.c')
| -rw-r--r-- | src/i830_dri.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index 3b029185..6366303e 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -1028,6 +1028,8 @@ I830DRISwapContext(ScreenPtr pScreen, DRISyncType syncType, if (I810_DEBUG & DEBUG_VERBOSE_DRI) ErrorF("i830DRISwapContext (in)\n"); + pI830->last_3d = LAST_3D_OTHER; + if (!pScrn->vtSema) return; pI830->LockHeld = 1; @@ -1047,7 +1049,6 @@ I830DRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index) { ScreenPtr pScreen = pWin->drawable.pScreen; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - I830Ptr pI830 = I830PTR(pScrn); BoxPtr pbox = REGION_RECTS(prgn); int nbox = REGION_NUM_RECTS(prgn); @@ -1085,7 +1086,7 @@ I830DRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index) } I830SelectBuffer(pScrn, I830_SELECT_FRONT); - pI830->AccelInfoRec->NeedToSync = TRUE; + i830MarkSync(pScrn); } /* This routine is a modified form of XAADoBitBlt with the calls to @@ -1248,8 +1249,7 @@ I830DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg, DEALLOCATE_LOCAL(pptNew1); DEALLOCATE_LOCAL(pboxNew1); } - - pI830->AccelInfoRec->NeedToSync = TRUE; + i830MarkSync(pScrn); } /* Use callbacks from dri.c to support pageflipping mode for a single |