svn merge ^/branches/released .

1 files changed, 32 insertions, 29 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;