svn merge ^/branches/released .

2 files changed, 161 insertions, 157 deletions

diff --git a/xorg-server/hw/xfree86/dri/dri.c b/xorg-server/hw/xfree86/dri/dri.c
index a8b050a94..378731624 100644
--- a/xorg-server/hw/xfree86/dri/dri.c
+++ b/xorg-server/hw/xfree86/dri/dri.c
@@ -74,10 +74,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)

 

 static int DRIEntPrivIndex = -1;

-static int DRIScreenPrivKeyIndex;

-static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKeyIndex;

-static int DRIWindowPrivKeyIndex;

-static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKeyIndex;

+static DevPrivateKeyRec DRIScreenPrivKeyRec;

+#define DRIScreenPrivKey (&DRIScreenPrivKeyRec)

+static DevPrivateKeyRec DRIWindowPrivKeyRec;

+#define DRIWindowPrivKey (&DRIWindowPrivKeyRec)

 static unsigned long DRIGeneration = 0;

 static unsigned int DRIDrawableValidationStamp = 0;

 

@@ -357,6 +357,11 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
     if (DRIGeneration != serverGeneration)

 	DRIGeneration = serverGeneration;

 

+    if (!dixRegisterPrivateKey(&DRIScreenPrivKeyRec, PRIVATE_SCREEN, 0))

+	return FALSE;

+    if (!dixRegisterPrivateKey(&DRIWindowPrivKeyRec, PRIVATE_WINDOW, 0))

+	return FALSE;

+

     pDRIPriv = (DRIScreenPrivPtr) calloc(1, sizeof(DRIScreenPrivRec));

     if (!pDRIPriv) {

 	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);

@@ -573,10 +578,8 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 	      drmInstallSIGIOHandler(pDRIPriv->drmFD, DRISwapContext))) {

 	    DRIDrvMsg(pScreen->myNum, X_ERROR,

 		      "[drm] failed to setup DRM signal handler\n");

-	    if (pDRIPriv->hiddenContextStore)

-		free(pDRIPriv->hiddenContextStore);

-	    if (pDRIPriv->partial3DContextStore)

-		free(pDRIPriv->partial3DContextStore);

+	    free(pDRIPriv->hiddenContextStore);

+	    free(pDRIPriv->partial3DContextStore);

 	    DRIDestroyContextPriv(pDRIContextPriv);

 	    return FALSE;

 	} else {

@@ -785,7 +788,7 @@ drmServerInfo DRIDRMServerInfo =  {
 Bool

 DRIExtensionInit(void)

 {

-    if (!DRIScreenPrivKey || DRIGeneration != serverGeneration) {

+    if (DRIGeneration != serverGeneration) {

 	return FALSE;

     }

 

@@ -1157,7 +1160,7 @@ DRIDCNTreeTraversal(WindowPtr pWin, pointer data)
 	ScreenPtr pScreen = pWin->drawable.pScreen;

 	DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

 

-	if (REGION_NUM_RECTS(&pWin->clipList) > 0) {

+	if (RegionNumRects(&pWin->clipList) > 0) {

 	    WindowPtr *pDRIWindows = (WindowPtr*)data;

 	    int i = 0;

 

@@ -1187,7 +1190,7 @@ DRIDriverClipNotify(ScreenPtr pScreen)
 

 	if (pDRIPriv->nrWindows > 0) {

 	    pDRIPriv->nrWalked = 0;

-	    TraverseTree(WindowTable[pScreen->myNum], DRIDCNTreeTraversal,

+	    TraverseTree(pScreen->root, DRIDCNTreeTraversal,

 			 (pointer)pDRIWindows);

 	}

 

@@ -1269,7 +1272,7 @@ DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
 	    pDRIDrawablePriv->pScreen = pScreen;

 	    pDRIDrawablePriv->refCount = 1;

 	    pDRIDrawablePriv->drawableIndex = -1;

-	    pDRIDrawablePriv->nrects = REGION_NUM_RECTS(&pWin->clipList);

+	    pDRIDrawablePriv->nrects = RegionNumRects(&pWin->clipList);

 

 	    /* save private off of preallocated index */

 	    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,

@@ -1288,8 +1291,8 @@ DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
 	    drmUpdateDrawableInfo(pDRIPriv->drmFD,

 				  pDRIDrawablePriv->hwDrawable,

 				  DRM_DRAWABLE_CLIPRECTS,

-				  REGION_NUM_RECTS(&pWin->clipList),

-				  REGION_RECTS(&pWin->clipList));

+				  RegionNumRects(&pWin->clipList),

+				  RegionRects(&pWin->clipList));

 	    *hHWDrawable = pDRIDrawablePriv->hwDrawable;

 	}

     }

@@ -1502,8 +1505,8 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
 #endif

 	    *W = (int)(pWin->drawable.width);

 	    *H = (int)(pWin->drawable.height);

-	    *numClipRects = REGION_NUM_RECTS(&pWin->clipList);

-	    *pClipRects = (drm_clip_rect_t *)REGION_RECTS(&pWin->clipList);

+	    *numClipRects = RegionNumRects(&pWin->clipList);

+	    *pClipRects = (drm_clip_rect_t *)RegionRects(&pWin->clipList);

 

 	    if (!*numClipRects && pDRIPriv->fullscreen) {

 				/* use fake full-screen clip rect */

@@ -1613,7 +1616,7 @@ DRICreateInfoRec(void)
 void

 DRIDestroyInfoRec(DRIInfoPtr DRIInfo)

 {

-    if (DRIInfo->busIdString) free(DRIInfo->busIdString);

+    free(DRIInfo->busIdString);

     free((char*)DRIInfo);

 }

 

@@ -1883,10 +1886,10 @@ DRITreeTraversal(WindowPtr pWin, pointer data)
         ScreenPtr pScreen = pWin->drawable.pScreen;

         DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

 

-	if(REGION_NUM_RECTS(&(pWin->clipList)) > 0) {

+	if(RegionNumRects(&(pWin->clipList)) > 0) {

 	   RegionPtr reg = (RegionPtr)data;

 

-	   REGION_UNION(pScreen, reg, reg, &(pWin->clipList));

+	   RegionUnion(reg, reg, &(pWin->clipList));

 	   pDRIPriv->nrWalked++;

 	}

 

@@ -1932,21 +1935,21 @@ DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     if(pDRIPriv->nrWindowsVisible > 0) {

        RegionRec reg;

 

-       REGION_NULL(pScreen, &reg);

+       RegionNull(&reg);

        pDRIPriv->nrWalked = 0;

        TraverseTree(pWin, DRITreeTraversal, (pointer)(&reg));

 

-       if(REGION_NOTEMPTY(pScreen, &reg)) {

-           REGION_TRANSLATE(pScreen, &reg, ptOldOrg.x - pWin->drawable.x,  

+       if(RegionNotEmpty(&reg)) {

+           RegionTranslate(&reg, ptOldOrg.x - pWin->drawable.x,

                                         ptOldOrg.y - pWin->drawable.y);

-           REGION_INTERSECT(pScreen, &reg, &reg, prgnSrc);

+           RegionIntersect(&reg, &reg, prgnSrc);

 

            /* The MoveBuffers interface is not ideal */

            (*pDRIPriv->pDriverInfo->MoveBuffers)(pWin, ptOldOrg, &reg,

 				pDRIPriv->pDriverInfo->ddxDrawableTableEntry);

        }

 

-       REGION_UNINIT(pScreen, &reg);

+       RegionUninit(&reg);

     }

 

     /* call lower wrapped functions */

@@ -2122,7 +2125,7 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy)
     if(!pDRIPriv) return;

 

     if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {

-        int nrects = REGION_NUM_RECTS(&pWin->clipList);

+        int nrects = RegionNumRects(&pWin->clipList);

 

         if(!pDRIPriv->windowsTouched) {

             DRILockTree(pScreen);

@@ -2143,7 +2146,7 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy)
 

 	drmUpdateDrawableInfo(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable,

 			      DRM_DRAWABLE_CLIPRECTS,

-			      nrects, REGION_RECTS(&pWin->clipList));

+			      nrects, RegionRects(&pWin->clipList));

     }

 

     /* call lower wrapped functions */

@@ -2368,9 +2371,9 @@ DRIMoveBuffersHelper(
    BoxRec tmpBox;

    int y, nbox;

 

-   extents = REGION_EXTENTS(pScreen, reg);

-   nbox = REGION_NUM_RECTS(reg);

-   pbox = REGION_RECTS(reg);

+   extents = RegionExtents(reg);

+   nbox = RegionNumRects(reg);

+   pbox = RegionRects(reg);

 

    if((dy > 0) && (dy < (extents->y2 - extents->y1))) {

      *ydir = -1;

diff --git a/xorg-server/hw/xfree86/dri/dristruct.h b/xorg-server/hw/xfree86/dri/dristruct.h
index fc929c2f9..bbd158e11 100644
--- a/xorg-server/hw/xfree86/dri/dristruct.h
+++ b/xorg-server/hw/xfree86/dri/dristruct.h
@@ -1,128 +1,129 @@
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Jens Owen <jens@tungstengraphics.com>
- *
- */
-
-#ifndef DRI_STRUCT_H
-#define DRI_STRUCT_H
-
-#include "xf86drm.h"
-#include "xf86Crtc.h"
-
-
-#define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) ((DRIDrawablePrivPtr) \
-    dixLookupPrivate(&(pWin)->devPrivates, DRIWindowPrivKey))
-#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) ((DRIDrawablePrivPtr) \
-    dixLookupPrivate(&(pPix)->devPrivates, DRIWindowPrivKey))
-
-typedef struct _DRIDrawablePrivRec
-{
-    drm_drawable_t		hwDrawable;
-    int			drawableIndex;
-    ScreenPtr		pScreen;
-    int 		refCount;
-    int 		nrects;
-} DRIDrawablePrivRec, *DRIDrawablePrivPtr;
-
-struct _DRIContextPrivRec
-{
-    drm_context_t		hwContext;
-    ScreenPtr		pScreen;
-    Bool     		valid3D;
-    DRIContextFlags     flags;
-    void**     		pContextStore;
-};
-
-#define DRI_SCREEN_PRIV(pScreen) ((DRIScreenPrivPtr) \
-    dixLookupPrivate(&(pScreen)->devPrivates, DRIScreenPrivKey))
-
-#define DRI_SCREEN_PRIV_FROM_INDEX(screenIndex) ((DRIScreenPrivPtr) \
-    dixLookupPrivate(&screenInfo.screens[screenIndex]->devPrivates, \
-		     DRIScreenPrivKey))
-
-#define DRI_ENT_PRIV(pScrn)  \
-    ((DRIEntPrivIndex < 0) ? \
-     NULL:		     \
-     ((DRIEntPrivPtr)(xf86GetEntityPrivate((pScrn)->entityList[0], \
-					   DRIEntPrivIndex)->ptr)))
-
-typedef struct _DRIScreenPrivRec
-{
-    Bool		directRenderingSupport;
-    int			drmFD;	      /* File descriptor for /dev/video/?   */
-    drm_handle_t   	hSAREA;	      /* Handle to SAREA, for mapping       */
-    XF86DRISAREAPtr	pSAREA;	      /* Mapped pointer to SAREA            */
-    drm_context_t          myContext;    /* DDX Driver's context               */
-    DRIContextPrivPtr   myContextPriv;/* Pointer to server's private area   */
-    DRIContextPrivPtr   lastPartial3DContext;  /* last one partially saved  */
-    void**		hiddenContextStore;    /* hidden X context          */
-    void**		partial3DContextStore; /* parital 3D context        */
-    DRIInfoPtr		pDriverInfo;
-    int                 nrWindows;
-    int                 nrWindowsVisible;
-    int                 nrWalked;
-    drm_clip_rect_t  private_buffer_rect; /* management of private buffers */
-    DrawablePtr         fullscreen; /* pointer to fullscreen drawable */
-    drm_clip_rect_t  fullscreen_rect; /* fake rect for fullscreen mode */
-    DRIWrappedFuncsRec	wrap;
-    DestroyWindowProcPtr DestroyWindow;
-    DrawablePtr		DRIDrawables[SAREA_MAX_DRAWABLES];
-    DRIContextPrivPtr   dummyCtxPriv; /* Pointer to dummy context */
-    Bool		createDummyCtx;
-    Bool		createDummyCtxPriv;
-    Bool		grabbedDRILock;
-    Bool		drmSIGIOHandlerInstalled;
-    Bool		wrapped;
-    Bool		windowsTouched;
-    int			lockRefCount;
-    drm_handle_t        hLSAREA;      /* Handle to SAREA containing lock, for mapping */
-    XF86DRILSAREAPtr    pLSAREA;      /* Mapped pointer to SAREA containing lock */
-    int*                pLockRefCount;
-    int*                pLockingContext;
-    xf86_crtc_notify_proc_ptr	xf86_crtc_notify;
-} DRIScreenPrivRec, *DRIScreenPrivPtr;
-
-
-typedef struct _DRIEntPrivRec {
-    int drmFD;
-    Bool drmOpened;
-    Bool sAreaGrabbed;
-    drm_handle_t hLSAREA;
-    XF86DRILSAREAPtr pLSAREA;
-    unsigned long sAreaSize;
-    int lockRefCount;
-    int lockingContext;
-    ScreenPtr resOwner;
-    Bool keepFDOpen;
-    int refCount;
-} DRIEntPrivRec, *DRIEntPrivPtr;
-
-#endif /* DRI_STRUCT_H */
+/**************************************************************************

+

+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, sub license, and/or sell copies of the Software, and to

+permit persons to whom the Software is furnished to do so, subject to

+the following conditions:

+

+The above copyright notice and this permission notice (including the

+next paragraph) shall be included in all copies or substantial portions

+of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR

+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+**************************************************************************/

+

+/*

+ * Authors:

+ *   Jens Owen <jens@tungstengraphics.com>

+ *

+ */

+

+#ifndef DRI_STRUCT_H

+#define DRI_STRUCT_H

+

+#include "xf86drm.h"

+#include "xf86Crtc.h"

+

+

+#define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) ((DRIDrawablePrivPtr) \

+    dixLookupPrivate(&(pWin)->devPrivates, DRIWindowPrivKey))

+#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) ((DRIDrawablePrivPtr) \

+    dixLookupPrivate(&(pPix)->devPrivates, DRIWindowPrivKey))

+

+typedef struct _DRIDrawablePrivRec

+{

+    drm_drawable_t		hwDrawable;

+    int			drawableIndex;

+    ScreenPtr		pScreen;

+    int 		refCount;

+    int 		nrects;

+} DRIDrawablePrivRec, *DRIDrawablePrivPtr;

+

+struct _DRIContextPrivRec

+{

+    drm_context_t		hwContext;

+    ScreenPtr		pScreen;

+    Bool     		valid3D;

+    DRIContextFlags     flags;

+    void**     		pContextStore;

+};

+

+#define DRI_SCREEN_PRIV(pScreen) ((DRIScreenPrivPtr) \

+    (dixPrivateKeyRegistered(DRIScreenPrivKey) ?			\

+     dixLookupPrivate(&(pScreen)->devPrivates, DRIScreenPrivKey) : NULL))

+

+#define DRI_SCREEN_PRIV_FROM_INDEX(screenIndex) ((DRIScreenPrivPtr) \

+    dixLookupPrivate(&screenInfo.screens[screenIndex]->devPrivates, \

+		     DRIScreenPrivKey))

+

+#define DRI_ENT_PRIV(pScrn)  \

+    ((DRIEntPrivIndex < 0) ? \

+     NULL:		     \

+     ((DRIEntPrivPtr)(xf86GetEntityPrivate((pScrn)->entityList[0], \

+					   DRIEntPrivIndex)->ptr)))

+

+typedef struct _DRIScreenPrivRec

+{

+    Bool		directRenderingSupport;

+    int			drmFD;	      /* File descriptor for /dev/video/?   */

+    drm_handle_t   	hSAREA;	      /* Handle to SAREA, for mapping       */

+    XF86DRISAREAPtr	pSAREA;	      /* Mapped pointer to SAREA            */

+    drm_context_t          myContext;    /* DDX Driver's context               */

+    DRIContextPrivPtr   myContextPriv;/* Pointer to server's private area   */

+    DRIContextPrivPtr   lastPartial3DContext;  /* last one partially saved  */

+    void**		hiddenContextStore;    /* hidden X context          */

+    void**		partial3DContextStore; /* parital 3D context        */

+    DRIInfoPtr		pDriverInfo;

+    int                 nrWindows;

+    int                 nrWindowsVisible;

+    int                 nrWalked;

+    drm_clip_rect_t  private_buffer_rect; /* management of private buffers */

+    DrawablePtr         fullscreen; /* pointer to fullscreen drawable */

+    drm_clip_rect_t  fullscreen_rect; /* fake rect for fullscreen mode */

+    DRIWrappedFuncsRec	wrap;

+    DestroyWindowProcPtr DestroyWindow;

+    DrawablePtr		DRIDrawables[SAREA_MAX_DRAWABLES];

+    DRIContextPrivPtr   dummyCtxPriv; /* Pointer to dummy context */

+    Bool		createDummyCtx;

+    Bool		createDummyCtxPriv;

+    Bool		grabbedDRILock;

+    Bool		drmSIGIOHandlerInstalled;

+    Bool		wrapped;

+    Bool		windowsTouched;

+    int			lockRefCount;

+    drm_handle_t        hLSAREA;      /* Handle to SAREA containing lock, for mapping */

+    XF86DRILSAREAPtr    pLSAREA;      /* Mapped pointer to SAREA containing lock */

+    int*                pLockRefCount;

+    int*                pLockingContext;

+    xf86_crtc_notify_proc_ptr	xf86_crtc_notify;

+} DRIScreenPrivRec, *DRIScreenPrivPtr;

+

+

+typedef struct _DRIEntPrivRec {

+    int drmFD;

+    Bool drmOpened;

+    Bool sAreaGrabbed;

+    drm_handle_t hLSAREA;

+    XF86DRILSAREAPtr pLSAREA;

+    unsigned long sAreaSize;

+    int lockRefCount;

+    int lockingContext;

+    ScreenPtr resOwner;

+    Bool keepFDOpen;

+    int refCount;

+} DRIEntPrivRec, *DRIEntPrivPtr;

+

+#endif /* DRI_STRUCT_H */