diff options
Diffstat (limited to 'hw/xfree86/xf8_32bpp/cfbscrinit.c')
| -rw-r--r-- | hw/xfree86/xf8_32bpp/cfbscrinit.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index 7cbdb5a66..5e2657f2b 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -31,15 +31,6 @@ /* CAUTION: We require that cfb8 and cfb32 were NOT compiled with CFB_NEED_SCREEN_PRIVATE */ -static BSFuncRec cfb8_32BSFuncRec = { - cfb8_32SaveAreas, - cfb8_32RestoreAreas, - (BackingStoreSetClipmaskRgnProcPtr) 0, - (BackingStoreGetImagePixmapProcPtr) 0, - (BackingStoreGetSpansPixmapProcPtr) 0, -}; - - int cfb8_32GCPrivateIndex; int cfb8_32GetGCPrivateIndex(void) { return cfb8_32GCPrivateIndex; } int cfb8_32ScreenPrivateIndex; @@ -65,11 +56,7 @@ cfb8_32AllocatePrivates(ScreenPtr pScreen) /* All cfb will have the same GC and Window private indicies */ - if(!mfbAllocatePrivates(pScreen,&cfbWindowPrivateIndex, &cfbGCPrivateIndex)) - return FALSE; - - /* The cfb indicies are the mfb indicies. Reallocating them resizes them */ - if(!AllocateWindowPrivate(pScreen,cfbWindowPrivateIndex,sizeof(cfbPrivWin))) + if(!mfbAllocatePrivates(pScreen, &cfbGCPrivateIndex)) return FALSE; if(!AllocateGCPrivate(pScreen, cfbGCPrivateIndex, sizeof(cfbPrivGC))) @@ -118,8 +105,6 @@ cfb8_32SetupScreen( pScreen->ChangeWindowAttributes = cfb8_32ChangeWindowAttributes; pScreen->RealizeWindow = cfb32MapWindow; /* OK */ pScreen->UnrealizeWindow = cfb32UnmapWindow; /* OK */ - pScreen->PaintWindowBackground = cfb8_32PaintWindow; - pScreen->PaintWindowBorder = cfb8_32PaintWindow; pScreen->CopyWindow = cfb8_32CopyWindow; pScreen->CreatePixmap = cfb32CreatePixmap; /* OK */ pScreen->DestroyPixmap = cfb32DestroyPixmap; /* OK */ @@ -220,7 +205,6 @@ cfb8_32FinishScreenInit( defaultVisual, nvisuals, visuals)) return FALSE; - pScreen->BackingStoreFuncs = cfb8_32BSFuncRec; pScreen->CreateScreenResources = cfb8_32CreateScreenResources; pScreen->CloseScreen = cfb8_32CloseScreen; pScreen->GetScreenPixmap = cfb32GetScreenPixmap; /* OK */ |