diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2007-10-16 20:02:02 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2007-10-16 20:02:17 +0100 |
| commit | 0521f562600e68cbef765d9e3f92ee765673e3d7 (patch) | |
| tree | 19a1f9e65814aa8aaf53312c1ede7adf95242e91 /glucose | |
| parent | ac51f7cb9b2bac77ef087ea4e59ca292a3e9f05f (diff) | |
Fix problems after master merge.
Diffstat (limited to 'glucose')
| -rw-r--r-- | glucose/glucose.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/glucose/glucose.c b/glucose/glucose.c index d0f1993f1..9e9933374 100644 --- a/glucose/glucose.c +++ b/glucose/glucose.c @@ -45,7 +45,6 @@ static ShmFuncs shmFuncs = { NULL, xglShmPutImage }; #endif -extern __GLXscreen **__glXActiveScreens; int xglScreenGeneration; int xglScreenPrivateIndex; int xglGCPrivateIndex; @@ -120,8 +119,11 @@ glucoseCreateWindow(WindowPtr pWin) xglScreenInfo.widthMm = pScreen->mmWidth; xglScreenInfo.heightMm = pScreen->mmHeight; - pScreenPriv->screen = __glXActiveScreens[pScreen->myNum]; + pScreenPriv->screen = glxGetScreen(pScreen); + /* This stops the driver being unload and prevents a crash. + * But should be solved properly. + */ pScreenPriv->destroyGLXscreen = pScreenPriv->screen->destroy; pScreenPriv->screen->destroy = glucoseDestroyGLXscreen; @@ -142,7 +144,7 @@ glucoseCreateWindow(WindowPtr pWin) AddResource(pPixmap->drawable.id, RT_PIXMAP, (pointer)pPixmap); } - pScreenPriv->rootDrawable = pScreenPriv->screen->createDrawable(pScreenPriv->screen, (DrawablePtr)pPixmap, pPixmap->drawable.id, modes); + pScreenPriv->rootDrawable = pScreenPriv->screen->createDrawable(pScreenPriv->screen, (DrawablePtr)pPixmap, GLX_DRAWABLE_PIXMAP, pPixmap->drawable.id, modes); if (!pScreenPriv->rootDrawable) { xf86DrvMsg(pScreen->myNum, X_WARNING, |