xserver: Branch 'master' - 2 commits

[Keith Packard]

 dbe/midbe.c    |    6 ------
 dbe/midbestr.h |   16 ----------------
 2 files changed, 22 deletions(-)

New commits:
commit 9f0b193acdc29e491b6245390cf9f53b5222e6d3
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Jul 1 09:13:43 2010 -0400

    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 <keithp at keithp.com>
    Tested-by: Magnus Kessler <Magnus.Kessler at gmx.net>
    Reviewed-by: Magnus Kessler <Magnus.Kessler at gmx.net>

diff --git a/dbe/midbe.c b/dbe/midbe.c
index 954f46e..b43ac1b 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))
commit a94cb400d15b8c78dc04148cbd8db8e5ec8364b5
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Jul 1 09:11:36 2010 -0400

    Delete unused miDbe screen private private datatype
    
    MiDbeScreenPrivPrivRec is not used in the server. Remove it, along
    with the MI_DBE_SCREEN_PRIV_PRIV macro that tried to use it.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Magnus.Kessler <Magnus.Kessler at gmx.net>

diff --git a/dbe/midbestr.h b/dbe/midbestr.h
index ae9f206..a47d8d9 100644
--- a/dbe/midbestr.h
+++ b/dbe/midbestr.h
@@ -48,11 +48,6 @@
 #define MI_DBE_WINDOW_PRIV_PRIV_FROM_WINDOW(pWin)\
     MI_DBE_WINDOW_PRIV_PRIV(DBE_WINDOW_PRIV(pWin))
 
-#define MI_DBE_SCREEN_PRIV_PRIV(pDbeScreenPriv) \
-    (!(pDbeScreenPriv) ? NULL : (MiDbeScreenPrivPrivPtr) \
-     dixLookupPrivate(&(pDbeScreenPriv)->devPrivates, miDbeScreenPrivPrivKey))
-
-
 /* TYPEDEFS */
 
 typedef struct _MiDbeWindowPrivPrivRec
@@ -80,16 +75,5 @@ typedef struct _MiDbeWindowPrivPrivRec
 
 } MiDbeWindowPrivPrivRec, *MiDbeWindowPrivPrivPtr;
 
-typedef struct _MiDbeScreenPrivPrivRec
-{
-    /* Place machine-specific fields in here.
-     * Since this is mi code, we do not really have machine-specific fields.
-     */
-
-    /* Pointer back to our screen private with which we are associated. */
-    DbeScreenPrivPtr	pDbeScreenPriv;
-
-} MiDbeScreenPrivPrivRec, *MiDbeScreenPrivPrivPtr;
-
 #endif /* MIDBE_STRUCT_H */