diff options
| -rw-r--r-- | src/mesa/drivers/dri/mga/mgapixel.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/savage/savagecontext.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/savage/savageioctl.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/savage/savagestate.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/mga/mgapixel.c b/src/mesa/drivers/dri/mga/mgapixel.c index f915d2e08b8..4f733adc4af 100644 --- 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 68a966a6a39..d081c1ce338 100644 --- 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 c5d234b37a1..c5f56e5b308 100644 --- 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 e64698ca90d..e5c8b96eec3 100644 --- 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. |