dri: Remove cliprect information from __DRIdrawable

3 files changed, 5 insertions, 51 deletions

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 945c85c06a6..6d78f82ce39 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -175,14 +175,8 @@ dri2CreateNewDrawable(__DRIscreen *screen,
     pdraw->pStamp = NULL;
     pdraw->lastStamp = 0;
     pdraw->index = 0;
-    pdraw->x = 0;
-    pdraw->y = 0;
     pdraw->w = 0;
     pdraw->h = 0;
-    pdraw->numClipRects = 0;
-    pdraw->numBackClipRects = 0;
-    pdraw->pClipRects = NULL;
-    pdraw->pBackClipRects = NULL;
     pdraw->vblSeq = 0;
     pdraw->vblFlags = 0;
 
@@ -201,9 +195,6 @@ dri2CreateNewDrawable(__DRIscreen *screen,
      */
     pdraw->swap_interval = (unsigned)-1;
 
-    pdraw->pClipRects = &pdraw->dri2.clipRect;
-    pdraw->pBackClipRects = &pdraw->dri2.clipRect;
-
     pdraw->pStamp = &pdraw->dri2.stamp;
     *pdraw->pStamp = pdraw->lastStamp + 1;
 
@@ -277,14 +268,6 @@ static void dri_put_drawable(__DRIdrawable *pdp)
 
 	psp = pdp->driScreenPriv;
         (*psp->DriverAPI.DestroyBuffer)(pdp);
-	if (pdp->pClipRects && pdp->pClipRects != &pdp->dri2.clipRect) {
-	    free(pdp->pClipRects);
-	    pdp->pClipRects = NULL;
-	}
-	if (pdp->pBackClipRects && pdp->pClipRects != &pdp->dri2.clipRect) {
-	    free(pdp->pBackClipRects);
-	    pdp->pBackClipRects = NULL;
-	}
 	free(pdp);
     }
 }
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index 817d77d9f7a..e4dc623d4d6 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -218,32 +218,7 @@ struct __DRIdrawableRec {
      */
     unsigned int lastStamp;
 
-    /**
-     * \name Drawable 
-     *
-     * Drawable information used in software fallbacks.
-     */
-    /*@{*/
-    int x;
-    int y;
-    int w;
-    int h;
-    int numClipRects;
-    drm_clip_rect_t *pClipRects;
-    /*@}*/
-
-    /**
-     * \name Back and depthbuffer
-     *
-     * Information about the back and depthbuffer where different from above.
-     */
-    /*@{*/
-    int backX;
-    int backY;
-    int backClipRectType;
-    int numBackClipRects;
-    drm_clip_rect_t *pBackClipRects;
-    /*@}*/
+    int w, h;
 
     /**
      * \name Vertical blank tracking information
@@ -289,7 +264,6 @@ struct __DRIdrawableRec {
 
     struct {
 	unsigned int stamp;
-	drm_clip_rect_t clipRect;
     } dri2;
 };
 
diff --git a/src/mesa/drivers/dri/common/spantmp_common.h b/src/mesa/drivers/dri/common/spantmp_common.h
index a4509a569d5..8916e7b0ca3 100644
--- a/src/mesa/drivers/dri/common/spantmp_common.h
+++ b/src/mesa/drivers/dri/common/spantmp_common.h
@@ -49,17 +49,14 @@
 #ifndef HW_CLIPLOOP
 #define HW_CLIPLOOP()							\
    do {									\
-      int _nc = dPriv->numClipRects;					\
-      while ( _nc-- ) {							\
-	 int minx = dPriv->pClipRects[_nc].x1 - dPriv->x;		\
-	 int miny = dPriv->pClipRects[_nc].y1 - dPriv->y;		\
-	 int maxx = dPriv->pClipRects[_nc].x2 - dPriv->x;		\
-	 int maxy = dPriv->pClipRects[_nc].y2 - dPriv->y;
+      int minx = 0;							\
+      int miny = 0;							\
+      int maxx = dPriv->w;						\
+      int maxy = dPriv->h;
 #endif
 
 #ifndef HW_ENDCLIPLOOP
 #define HW_ENDCLIPLOOP()						\
-      }									\
    } while (0)
 #endif