diff options
author | Kevin E Martin <kem@kem.org> | 2006-05-18 21:14:44 +0000 |
---|---|---|
committer | Kevin E Martin <kem@kem.org> | 2006-05-18 21:14:44 +0000 |
commit | 509c5587ad0474aee101d6dcebe87e02231ebe7d (patch) | |
tree | 0d3b0dd90a4ad61b64077767b66fc79cf1e3b1c1 | |
parent | c639cb95424cdf7b8c04a0970b68114f2224c150 (diff) |
Fix ShadowFB support to work with recent miext/shadow changes from bugXORG-7_1
#5460.
-rw-r--r-- | src/wsfb_driver.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/wsfb_driver.c b/src/wsfb_driver.c index 7a30cb8..5be284f 100644 --- a/src/wsfb_driver.c +++ b/src/wsfb_driver.c @@ -177,7 +177,6 @@ static const char *fbSymbols[] = { NULL }; static const char *shadowSymbols[] = { - "shadowAlloc", "shadowInit", "shadowUpdatePacked", NULL @@ -236,7 +235,6 @@ typedef struct { unsigned char* fbstart; unsigned char* fbmem; size_t fbmem_len; - unsigned char* shadowmem; Bool shadowFB; CloseScreenProcPtr CloseScreen; EntityInfoPtr pEnt; @@ -682,17 +680,8 @@ WsfbScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) height = pScrn->virtualY; width = pScrn->virtualX; - /* shadowfb */ - if (fPtr->shadowFB) { - if ((fPtr->shadowmem = shadowAlloc(width, height, - pScrn->bitsPerPixel)) == NULL) - return FALSE; + fPtr->fbstart = fPtr->fbmem; - fPtr->fbstart = fPtr->shadowmem; - } else { - fPtr->shadowmem = NULL; - fPtr->fbstart = fPtr->fbmem; - } switch (pScrn->bitsPerPixel) { case 1: ret = xf1bppScreenInit(pScreen, fPtr->fbstart, @@ -813,8 +802,6 @@ WsfbCloseScreen(int scrnIndex, ScreenPtr pScreen) fPtr->fbmem = NULL; } - if (fPtr->shadowmem) - xfree(fPtr->shadowmem); #ifdef XFreeXDGA if (fPtr->pDGAMode) { xfree(fPtr->pDGAMode); |