1 files changed, 61 insertions, 18 deletions

diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c
index 8a1defdb0..10af0b286 100644
--- a/xorg-server/Xext/shm.c
+++ b/xorg-server/Xext/shm.c
@@ -101,6 +101,12 @@ typedef struct _ShmDesc {
     unsigned long size;

 } ShmDescRec, *ShmDescPtr;

 

+typedef struct _ShmScrPrivateRec {

+    CloseScreenProcPtr CloseScreen;

+    ShmFuncsPtr shmFuncs;

+    DestroyPixmapProcPtr destroyPixmap;

+} ShmScrPrivateRec;

+

 static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);

 static int ShmDetachSegment(

     pointer		/* value */,

@@ -137,13 +143,16 @@ int BadShmSegCode;
 RESTYPE ShmSegType;

 static ShmDescPtr Shmsegs;

 static Bool sharedPixmaps;

-static ShmFuncsPtr shmFuncs[MAXSCREENS];

-static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS];

+static DrawablePtr *drawables;

+static int shmScrPrivateKeyIndex;

+static DevPrivateKey shmScrPrivateKey = &shmScrPrivateKeyIndex;

 static int shmPixmapPrivateIndex;

 static DevPrivateKey shmPixmapPrivate = &shmPixmapPrivateIndex;

 static ShmFuncs miFuncs = {NULL, NULL};

 static ShmFuncs fbFuncs = {fbShmCreatePixmap, NULL};

 

+#define ShmGetScreenPriv(s) ((ShmScrPrivateRec *)dixLookupPrivate(&(s)->devPrivates, shmScrPrivateKey))

+

 #define VERIFY_SHMSEG(shmseg,shmdesc,client) \

 { \

     int rc; \

@@ -214,6 +223,30 @@ static Bool CheckForShmSyscall(void)
 

 #endif

 

+static Bool

+ShmCloseScreen(int i, ScreenPtr pScreen)

+{

+    ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);

+    pScreen->CloseScreen = screen_priv->CloseScreen;

+    dixSetPrivate(&pScreen->devPrivates, shmScrPrivateKey, NULL);

+    xfree (screen_priv);

+    return (*pScreen->CloseScreen) (i, pScreen);

+}

+

+static ShmScrPrivateRec *

+ShmInitScreenPriv(ScreenPtr pScreen)

+{

+    ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);

+    if (!screen_priv)

+    {

+	screen_priv = xcalloc (1, sizeof (ShmScrPrivateRec));

+	screen_priv->CloseScreen = pScreen->CloseScreen;

+	dixSetPrivate(&pScreen->devPrivates, shmScrPrivateKey, screen_priv);

+	pScreen->CloseScreen = ShmCloseScreen;

+    }

+    return screen_priv;

+}

+

 void

 ShmExtensionInit(INITARGS)

 {

@@ -228,20 +261,29 @@ ShmExtensionInit(INITARGS)
     }

 #endif

 

+    drawables = xcalloc(screenInfo.numScreens, sizeof(DrawablePtr));

+    if (!drawables)

+    {

+	ErrorF("MIT-SHM extension disabled: no memory for per-screen drawables\n");

+	return;

+    }

+

     sharedPixmaps = xFalse;

     {

       sharedPixmaps = xTrue;

       for (i = 0; i < screenInfo.numScreens; i++)

       {

-	if (!shmFuncs[i])

-	    shmFuncs[i] = &miFuncs;

-	if (!shmFuncs[i]->CreatePixmap)

+	ShmScrPrivateRec *screen_priv = ShmInitScreenPriv(screenInfo.screens[i]);

+	if (!screen_priv->shmFuncs)

+	    screen_priv->shmFuncs = &miFuncs;

+	if (!screen_priv->shmFuncs->CreatePixmap)

 	    sharedPixmaps = xFalse;

       }

       if (sharedPixmaps)

 	for (i = 0; i < screenInfo.numScreens; i++)

 	{

-	    destroyPixmap[i] = screenInfo.screens[i]->DestroyPixmap;

+	    ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(screenInfo.screens[i]);

+	    screen_priv->destroyPixmap = screenInfo.screens[i]->DestroyPixmap;

 	    screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap;

 	}

     }

@@ -263,23 +305,21 @@ static void
 ShmResetProc(ExtensionEntry *extEntry)

 {

     int i;

-

-    for (i = 0; i < MAXSCREENS; i++)

-    {

-	shmFuncs[i] = NULL;

-    }

+    for (i = 0; i < screenInfo.numScreens; i++)

+	ShmRegisterFuncs(screenInfo.screens[i], NULL);

 }

 

 void

 ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs)

 {

-    shmFuncs[pScreen->myNum] = funcs;

+    ShmInitScreenPriv(pScreen)->shmFuncs = funcs;

 }

 

 static Bool

 ShmDestroyPixmap (PixmapPtr pPixmap)

 {

     ScreenPtr	    pScreen = pPixmap->drawable.pScreen;

+    ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen);

     Bool	    ret;

     if (pPixmap->refcnt == 1)

     {

@@ -290,9 +330,9 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
 	    ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id);

     }

     

-    pScreen->DestroyPixmap = destroyPixmap[pScreen->myNum];

+    pScreen->DestroyPixmap = screen_priv->destroyPixmap;

     ret = (*pScreen->DestroyPixmap) (pPixmap);

-    destroyPixmap[pScreen->myNum] = pScreen->DestroyPixmap;

+    screen_priv->destroyPixmap = pScreen->DestroyPixmap;

     pScreen->DestroyPixmap = ShmDestroyPixmap;

     return ret;

 }

@@ -300,7 +340,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
 void

 ShmRegisterFbFuncs(ScreenPtr pScreen)

 {

-    shmFuncs[pScreen->myNum] = &fbFuncs;

+    ShmRegisterFuncs(pScreen, &fbFuncs);

 }

 

 static int

@@ -597,7 +637,6 @@ static int
 ProcPanoramiXShmGetImage(ClientPtr client)

 {

     PanoramiXRes	*draw;

-    DrawablePtr 	drawables[MAXSCREENS];

     DrawablePtr 	pDraw;

     xShmGetImageReply	xgi;

     ShmDescPtr		shmdesc;

@@ -786,9 +825,11 @@ CreatePmap:
     result = (client->noClientException);

 

     FOR_NSCREENS(j) {

+	ShmScrPrivateRec *screen_priv;

 	pScreen = screenInfo.screens[j];

 

-	pMap = (*shmFuncs[j]->CreatePixmap)(pScreen, 

+	screen_priv = ShmGetScreenPriv(pScreen);

+	pMap = (*screen_priv->shmFuncs->CreatePixmap)(pScreen,

 				stuff->width, stuff->height, stuff->depth,

 				shmdesc->addr + stuff->offset);

 

@@ -1071,6 +1112,7 @@ ProcShmCreatePixmap(ClientPtr client)
     DepthPtr pDepth;

     int i, rc;

     ShmDescPtr shmdesc;

+    ShmScrPrivateRec *screen_priv;

     REQUEST(xShmCreatePixmapReq);

     unsigned int width, height, depth;

     unsigned long size;

@@ -1119,7 +1161,8 @@ CreatePmap:
 	return BadAlloc;

 

     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);

-    pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(

+    screen_priv = ShmGetScreenPriv(pDraw->pScreen);

+    pMap = (*screen_priv->shmFuncs->CreatePixmap)(

 			    pDraw->pScreen, stuff->width,

 			    stuff->height, stuff->depth,

 			    shmdesc->addr + stuff->offset);