diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-11-03 06:21:07 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-11-03 06:21:07 +0000 |
| commit | db4690c957eab54bfd865dbda02229aaa2c39e77 (patch) | |
| tree | 80e472b16d1351f607eaa534772f8bc064b2a400 /driver/xf86-video-sunffb/src/ffb_accel.c | |
| parent | e36a12d15aa8d4142a73f24c16a53d3f97fe8fe5 (diff) | |
xf86-video-sunffb 1.2.0.
Diffstat (limited to 'driver/xf86-video-sunffb/src/ffb_accel.c')
| -rw-r--r-- | driver/xf86-video-sunffb/src/ffb_accel.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/driver/xf86-video-sunffb/src/ffb_accel.c b/driver/xf86-video-sunffb/src/ffb_accel.c index b9cb05301..b8ad1d065 100644 --- a/driver/xf86-video-sunffb/src/ffb_accel.c +++ b/driver/xf86-video-sunffb/src/ffb_accel.c @@ -44,11 +44,6 @@ #include "ffb_loops.h" #include "ffb_regs.h" -int CreatorScreenPrivateIndex; -int CreatorGCPrivateIndex; -int CreatorWindowPrivateIndex; -int CreatorGeneration; - /* Indexed by ffb resolution enum. */ struct fastfill_parms ffb_fastfill_parms[] = { /* fsmall, psmall, ffh, ffw, pfh, pfw */ @@ -61,7 +56,8 @@ struct fastfill_parms ffb_fastfill_parms[] = { void CreatorVtChange (ScreenPtr pScreen, int enter) { - FFBPtr pFfb = GET_FFB_FROM_SCREEN (pScreen); + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + FFBPtr pFfb = GET_FFB_FROM_SCRN (pScrn); ffb_fbcPtr ffb = pFfb->regs; pFfb->rp_active = 1; @@ -847,22 +843,6 @@ Bool FFBAccelInit(ScreenPtr pScreen, FFBPtr pFfb) XAAInfoRecPtr infoRec; ffb_fbcPtr ffb = pFfb->regs; - if (serverGeneration != CreatorGeneration) { - CreatorScreenPrivateIndex = AllocateScreenPrivateIndex (); - if (CreatorScreenPrivateIndex == -1) - return FALSE; - CreatorGCPrivateIndex = AllocateGCPrivateIndex (); - CreatorWindowPrivateIndex = AllocateWindowPrivateIndex (); - CreatorGeneration = serverGeneration; - } - - if (!AllocateGCPrivate(pScreen, CreatorGCPrivateIndex, sizeof(CreatorPrivGCRec))) - return FALSE; - if (!AllocateWindowPrivate(pScreen, CreatorWindowPrivateIndex, 0)) - return FALSE; - - pScreen->devPrivates[CreatorScreenPrivateIndex].ptr = pFfb; - pFfb->xaa_fbc = (FFB_FBC_WB_A | FFB_FBC_WM_COMBINED | FFB_FBC_RB_A | FFB_FBC_WE_FORCEON | FFB_FBC_SB_BOTH | |