diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-03-07 15:49:47 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-03-07 15:49:47 +0000 |
| commit | a5f0522b1d34236278861fe15bac2df099f0a2c7 (patch) | |
| tree | 3e31df3257842191fcc15b8568ef2ff301ef93ae | |
| parent | 81722a21d232fa6cfb11fbe3d984abab50e89bcc (diff) | |
Add some additional checks when XAA is enabled.
| -rw-r--r-- | src/i810_accel.c | 3 | ||||
| -rw-r--r-- | src/i810_dri.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/i810_accel.c b/src/i810_accel.c index efbe2907..1f859b8a 100644 --- a/src/i810_accel.c +++ b/src/i810_accel.c @@ -597,7 +597,8 @@ I810RefreshRing(ScrnInfoPtr pScrn) if (pI810->LpRing->space < 0) pI810->LpRing->space += pI810->LpRing->mem.Size; - pI810->AccelInfoRec->NeedToSync = TRUE; + if (pI810->AccelInfoRec) + pI810->AccelInfoRec->NeedToSync = TRUE; } /* Emit on gaining VT? diff --git a/src/i810_dri.c b/src/i810_dri.c index 3e322837..72718d34 100644 --- a/src/i810_dri.c +++ b/src/i810_dri.c @@ -222,6 +222,7 @@ I810InitVisualConfigs(ScreenPtr pScreen) pConfigs[i].redSize = 5; pConfigs[i].greenSize = 6; pConfigs[i].blueSize = 5; + pConfigs[i].alphaSize = 0; pConfigs[i].redMask = 0x0000F800; pConfigs[i].greenMask = 0x000007E0; pConfigs[i].blueMask = 0x0000001F; @@ -1173,7 +1174,9 @@ I810DRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index) pbox++; } I810SelectBuffer(pScrn, I810_SELECT_FRONT); - pI810->AccelInfoRec->NeedToSync = TRUE; + + if (pI810->AccelInfoRec) + pI810->AccelInfoRec->NeedToSync = TRUE; } /* This routine is a modified form of XAADoBitBlt with the calls to @@ -1332,7 +1335,8 @@ I810DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg, DEALLOCATE_LOCAL(pboxNew1); } - pI810->AccelInfoRec->NeedToSync = TRUE; + if (pI810->AccelInfoRec) + pI810->AccelInfoRec->NeedToSync = TRUE; } |