From 9f0b193acdc29e491b6245390cf9f53b5222e6d3 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 1 Jul 2010 09:13:43 -0400 Subject: [PATCH] miDbe window priv priv is pre-allocated, don't use dixSetPrivate (bug 28639) miDbeInit pre-allocates space in each DBE window private private for a MiDbeWindowPrivPrivRec. miDbeAllocBackBufferName used the pre-allocated space correctly (simply fetching it instead of allocating a new piece of memory). However, it then called dixSetPrivate anyways, which isn't necessary, and (in the new dixPrivate world) causes an assert failure. Signed-off-by: Keith Packard Tested-by: Magnus Kessler Reviewed-by: Magnus Kessler --- dbe/midbe.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dbe/midbe.c b/dbe/midbe.c index 954f46e1a..b43ac1b3d 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -202,12 +202,6 @@ miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction) return (rc == Success) ? BadAlloc : rc; } - - /* Attach the priv priv to the priv. */ - dixSetPrivate(&pDbeWindowPriv->devPrivates, miDbeWindowPrivPrivKey, - pDbeWindowPrivPriv); - - /* Clear the back buffer. */ pGC = GetScratchGC(pWin->drawable.depth, pWin->drawable.pScreen); if ((*pDbeScreenPriv->SetupBackgroundPainter)(pWin, pGC))