get rid of last few XF86DRIClipRect

diff --git a/src/mesa/drivers/dri/mga/mgapixel.c b/src/mesa/drivers/dri/mga/mgapixel.c
index f915d2e08b8c7b63d05373094bdf3edfdee8cbd4..4f733adc4afe83ef85ae86ec03ace82e58153eb2 100644 (file)
--- a/src/mesa/drivers/dri/mga/mgapixel.c
+++ b/src/mesa/drivers/dri/mga/mgapixel.c
@@ -324,7 +324,7 @@ mgaTryReadPixels( GLcontext *ctx,
       for (i = 0 ; i < nbox ; )
       {
         int nr = MIN2(i + MGA_NR_SAREA_CLIPRECTS, dPriv->numClipRects);
-        XF86DRIClipRectRec *box = dPriv->pClipRects;
+        drm_clip_rect_t *box = dPriv->pClipRects;
         drm_clip_rect_t *b = mmesa->sarea->boxes;
         int n = 0;
 
@@ -392,7 +392,7 @@ static void do_draw_pix( GLcontext *ctx,
    mgaContextPtr mmesa = MGA_CONTEXT(ctx);
    drmMGABlit blit;
    __DRIdrawablePrivate *dPriv = mmesa->driDrawable;
-   XF86DRIClipRectPtr pbox = dPriv->pClipRects;
+   drm_clip_rect_t pbox = dPriv->pClipRects;
    int nbox = dPriv->numClipRects;
    int retcode, i;
 
@@ -425,7 +425,7 @@ static void do_draw_pix( GLcontext *ctx,
    for (i = 0 ; i < nbox ; )
    {
       int nr = MIN2(i + MGA_NR_SAREA_CLIPRECTS, dPriv->numClipRects);
-      XF86DRIClipRectRec *box = mmesa->pClipRects;
+      drm_clip_rect_t *box = mmesa->pClipRects;
       drm_clip_rect_t *b = mmesa->sarea->boxes;
       int n = 0;
 

diff --git a/src/mesa/drivers/dri/savage/savagecontext.h b/src/mesa/drivers/dri/savage/savagecontext.h
index 68a966a6a39d505e623130568275613ab987dcd7..d081c1ce338ef5d12163d33bac2216e299ae3d5d 100644 (file)
--- a/src/mesa/drivers/dri/savage/savagecontext.h
+++ b/src/mesa/drivers/dri/savage/savagecontext.h
@@ -209,7 +209,7 @@ struct savage_context_t {
     int drawY;
     GLuint numClipRects;               /* cliprects for that buffer */
     GLint currentClip;
-    XF86DRIClipRectPtr pClipRects;
+    drm_clip_rect_t *pClipRects;
 
     /*  use this bit to support single/double buffer */
     GLuint IsDouble;
@@ -232,7 +232,7 @@ struct savage_context_t {
     GLboolean scissorChanged;
     drm_clip_rect_t draw_rect;
     drm_clip_rect_t scissor_rect;
-    XF86DRIClipRectRec tmp_boxes[2][SAVAGE_NR_SAREA_CLIPRECTS];
+    drm_clip_rect_t tmp_boxes[2][SAVAGE_NR_SAREA_CLIPRECTS];
     /*Texture aging and DMA based aging*/
     unsigned int texAge[SAVAGE_NR_TEX_HEAPS]; 
 

diff --git a/src/mesa/drivers/dri/savage/savageioctl.c b/src/mesa/drivers/dri/savage/savageioctl.c
index c5d234b37a1894d84630d071a1dd388a4eb6fc52..c5f56e5b308f9f57b7bb9d50d74f639e710741ac 100644 (file)
--- a/src/mesa/drivers/dri/savage/savageioctl.c
+++ b/src/mesa/drivers/dri/savage/savageioctl.c
@@ -278,7 +278,7 @@ static void savageDDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
 
        for (i = 0 ; i < imesa->numClipRects ; ) {       
           int nr = MIN2(i + SAVAGE_NR_SAREA_CLIPRECTS, imesa->numClipRects);
-          XF86DRIClipRectRec *box = imesa->pClipRects;  
+          drm_clip_rect_t *box = imesa->pClipRects;     
           drm_clip_rect_t *b = imesa->sarea->boxes;
           int n = 0;
 
@@ -332,7 +332,7 @@ static void savageDDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
 void savageSwapBuffers( __DRIdrawablePrivate *dPriv )
 {
    savageContextPtr imesa;
-   XF86DRIClipRectPtr pbox;
+   drm_clip_rect_t *pbox;
    int nbox;
    int i;
 
@@ -359,7 +359,7 @@ void savageSwapBuffers( __DRIdrawablePrivate *dPriv )
    for (i = 0 ; i < nbox ; )
    {
       int nr = MIN2(i + SAVAGE_NR_SAREA_CLIPRECTS, dPriv->numClipRects);
-      XF86DRIClipRectRec *b = (XF86DRIClipRectRec *)imesa->sarea->boxes;
+      drm_clip_rect_t *b = (drm_clip_rect_t *)imesa->sarea->boxes;
 
       imesa->sarea->nbox = nr - i;
 

diff --git a/src/mesa/drivers/dri/savage/savagestate.c b/src/mesa/drivers/dri/savage/savagestate.c
index e64698ca90d74c7c9009004bd658f8f64a03a7f9..e5c8b96eec3f07ac2f233a1c1fbe41b9b334352a 100644 (file)
--- a/src/mesa/drivers/dri/savage/savagestate.c
+++ b/src/mesa/drivers/dri/savage/savagestate.c
@@ -1342,7 +1342,7 @@ void savageEmitDrawingRectangle( savageContextPtr imesa )
 {
     __DRIdrawablePrivate *dPriv = imesa->driDrawable;
     savageScreenPrivate *savageScreen = imesa->savageScreen;
-    XF86DRIClipRectPtr pbox;
+    drm_clip_rect_t *pbox;
     int nbox;
    
 
@@ -1808,7 +1808,7 @@ void savageDDRenderStart(GLcontext *ctx)
 {
     savageContextPtr imesa = SAVAGE_CONTEXT( ctx );
     __DRIdrawablePrivate *dPriv = imesa->driDrawable;
-    XF86DRIClipRectPtr pbox;
+    drm_clip_rect_t *pbox;
     GLint nbox;
 
     /* if the screen is overrided by other application. set the scissor.