andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shadowfb: Fix compilation errors

Browse Source 
Ok, that's embarassing -- I didn't even make sure Adam's patch
compiled. These are minimal fixes to make it build.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2014-04-21 21:38:28 -07:00
parent 2dcb167262
commit 5df66822c9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xfree86/shadowfb/shadow.c
View File

@ -36,6 +36,7 @@ typedef struct {
RefreshAreaFuncPtr preRefresh; RefreshAreaFuncPtr preRefresh;
RefreshAreaFuncPtr postRefresh; RefreshAreaFuncPtr postRefresh;
CloseScreenProcPtr CloseScreen; CloseScreenProcPtr CloseScreen;
CreateScreenResourcesProcPtr CreateScreenResources;
} ShadowScreenRec, *ShadowScreenPtr; } ShadowScreenRec, *ShadowScreenPtr;
static DevPrivateKeyRec ShadowScreenKeyRec; static DevPrivateKeyRec ShadowScreenKeyRec;
@ -43,7 +44,7 @@ static DevPrivateKeyRec ShadowScreenKeyRec;
static ShadowScreenPtr static ShadowScreenPtr
shadowfbGetScreenPrivate(ScreenPtr pScreen) shadowfbGetScreenPrivate(ScreenPtr pScreen)
{ {
return dixLookupPrivate(&(pScreen)->devPrivates, &ShadowScreenKeyRec) return dixLookupPrivate(&(pScreen)->devPrivates, &ShadowScreenKeyRec);
} }
Bool Bool
@ -53,7 +54,6 @@ ShadowFBInit2(ScreenPtr pScreen,
{ {
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
ShadowScreenPtr pPriv; ShadowScreenPtr pPriv;
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
if (!preRefreshArea && !postRefreshArea) if (!preRefreshArea && !postRefreshArea)
return FALSE; return FALSE;
@ -69,7 +69,6 @@ ShadowFBInit2(ScreenPtr pScreen,
pPriv->pScrn = pScrn; pPriv->pScrn = pScrn;
pPriv->preRefresh = preRefreshArea; pPriv->preRefresh = preRefreshArea;
pPriv->postRefresh = postRefreshArea; pPriv->postRefresh = postRefreshArea;
pPriv->vtSema = TRUE;
pPriv->CloseScreen = pScreen->CloseScreen; pPriv->CloseScreen = pScreen->CloseScreen;
pPriv->CreateScreenResources = pScreen->CreateScreenResources; pPriv->CreateScreenResources = pScreen->CreateScreenResources;
@ -125,7 +124,7 @@ ShadowCreateScreenResources(ScreenPtr pScreen)
ShadowScreenPtr pPriv = shadowfbGetScreenPrivate(pScreen); ShadowScreenPtr pPriv = shadowfbGetScreenPrivate(pScreen);
pScreen->CreateScreenResources = pPriv->CreateScreenResources; pScreen->CreateScreenResources = pPriv->CreateScreenResources;
ret = pScreen->CreateScreenResources(pWin); ret = pScreen->CreateScreenResources(pScreen);
pPriv->CreateScreenResources = pScreen->CreateScreenResources; pPriv->CreateScreenResources = pScreen->CreateScreenResources;
pScreen->CreateScreenResources = ShadowCreateScreenResources; pScreen->CreateScreenResources = ShadowCreateScreenResources;
@ -162,7 +161,7 @@ ShadowCloseScreen(ScreenPtr pScreen)
pScreen->CloseScreen = pPriv->CloseScreen; pScreen->CloseScreen = pPriv->CloseScreen;
pScreen->CreateScreenResources = pPriv->CreateScreenResources; pScreen->CreateScreenResources = pPriv->CreateScreenResources;
free((pointer) pPriv); free(pPriv);
return (*pScreen->CloseScreen) (pScreen); return (*pScreen->CloseScreen) (pScreen);
} }