|
|
@@ -113,8 +113,6 @@ typedef struct { |
|
|
|
|
|
|
|
unsigned int lineBias; |
|
|
|
|
|
|
|
CloseScreenProcPtr closeScreen; |
|
|
|
|
|
|
|
vfbFramebufferInfo fb; |
|
|
|
|
|
|
|
Bool pixelFormatDefined; |
|
|
@@ -1108,23 +1106,6 @@ vncRandRInit(ScreenPtr pScreen) |
|
|
|
return TRUE; |
|
|
|
} |
|
|
|
|
|
|
|
static Bool |
|
|
|
vfbCloseScreen(ScreenPtr pScreen) |
|
|
|
{ |
|
|
|
vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum]; |
|
|
|
|
|
|
|
pScreen->CloseScreen = pvfb->closeScreen; |
|
|
|
|
|
|
|
/* |
|
|
|
* fb overwrites miCloseScreen, so do this here |
|
|
|
*/ |
|
|
|
if (pScreen->devPrivate) |
|
|
|
(*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate); |
|
|
|
pScreen->devPrivate = NULL; |
|
|
|
|
|
|
|
return pScreen->CloseScreen(pScreen); |
|
|
|
} |
|
|
|
|
|
|
|
static Bool |
|
|
|
vfbScreenInit(ScreenPtr pScreen, int argc, char **argv) |
|
|
|
{ |
|
|
@@ -1250,9 +1231,6 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv) |
|
|
|
|
|
|
|
miSetZeroLineBias(pScreen, pvfb->lineBias); |
|
|
|
|
|
|
|
pvfb->closeScreen = pScreen->CloseScreen; |
|
|
|
pScreen->CloseScreen = vfbCloseScreen; |
|
|
|
|
|
|
|
return TRUE; |
|
|
|
|
|
|
|
} /* end vfbScreenInit */ |