diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 97821c2da..0ac005a1e 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -291,8 +291,6 @@ typedef Bool (*winCreatePrimarySurfaceProcPtr) (ScreenPtr); typedef Bool (*winReleasePrimarySurfaceProcPtr) (ScreenPtr); -typedef Bool (*winCreateScreenResourcesProc) (ScreenPtr); - /* * Pixmap privates */ @@ -496,7 +494,6 @@ typedef struct _winPrivScreenRec { winDestroyColormapProcPtr pwinDestroyColormap; winCreatePrimarySurfaceProcPtr pwinCreatePrimarySurface; winReleasePrimarySurfaceProcPtr pwinReleasePrimarySurface; - winCreateScreenResourcesProc pwinCreateScreenResources; /* Window Procedures for Rootless mode */ ValidateTreeProcPtr ValidateTree; diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index 0fc7b9d9e..65820db8f 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -35,6 +35,9 @@ #ifdef HAVE_XWIN_CONFIG_H #include #endif + +#include "mi/mi_priv.h" + #include "win.h" #include "winmsg.h" @@ -206,9 +209,8 @@ static Bool winCreateScreenResources(ScreenPtr pScreen) { winScreenPriv(pScreen); - Bool result; - result = pScreenPriv->pwinCreateScreenResources(pScreen); + Bool result = miCreateScreenResources(pScreen); /* Now the screen bitmap has been wrapped in a pixmap, add that to the Shadow framebuffer */ @@ -362,7 +364,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) /* Wrap CreateScreenResources so we can add the screen pixmap to the Shadow framebuffer after it's been created */ - pScreenPriv->pwinCreateScreenResources = pScreen->CreateScreenResources; pScreen->CreateScreenResources = winCreateScreenResources; }