diff options
Diffstat (limited to 'src/mesa/drivers/dri/i830')
| -rw-r--r-- | src/mesa/drivers/dri/i830/Makefile.solo | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i830/i830_context.h | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i830/i830_ioctl.c | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i830/server/i830_dri.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/i830/Makefile.solo b/src/mesa/drivers/dri/i830/Makefile.solo index 091c4be95f..b5c12e37fe 100644 --- a/src/mesa/drivers/dri/i830/Makefile.solo +++ b/src/mesa/drivers/dri/i830/Makefile.solo @@ -7,7 +7,7 @@ TOP = ../../../../.. default: linux-solo -SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver +SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver -I../drm/shared MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini DEFINES += \ diff --git a/src/mesa/drivers/dri/i830/i830_context.h b/src/mesa/drivers/dri/i830/i830_context.h index 5f4bb565e1..95c2e925e2 100644 --- a/src/mesa/drivers/dri/i830/i830_context.h +++ b/src/mesa/drivers/dri/i830/i830_context.h @@ -195,7 +195,7 @@ struct i830_context_t int drawX; /* origin of drawable in draw buffer */ int drawY; GLuint numClipRects; /* cliprects for that buffer */ - XF86DRIClipRectPtr pClipRects; + drm_clip_rect_t *pClipRects; int lastSwap; int texAge; @@ -206,11 +206,11 @@ struct i830_context_t int do_irqs; GLboolean scissor; - XF86DRIClipRectRec draw_rect; - XF86DRIClipRectRec scissor_rect; + drm_clip_rect_t draw_rect; + drm_clip_rect_t scissor_rect; drmContext hHWContext; - drmLock *driHwLock; + drm_hw_lock_t *driHwLock; int driFd; __DRIdrawablePrivate *driDrawable; diff --git a/src/mesa/drivers/dri/i830/i830_ioctl.c b/src/mesa/drivers/dri/i830/i830_ioctl.c index a0f062505b..cad48db9df 100644 --- a/src/mesa/drivers/dri/i830/i830_ioctl.c +++ b/src/mesa/drivers/dri/i830/i830_ioctl.c @@ -480,7 +480,7 @@ static void i830Clear(GLcontext *ctx, GLbitfield mask, GLboolean all, for (i = 0 ; i < imesa->numClipRects ; ) { int nr = MIN2(i + I830_NR_SAREA_CLIPRECTS, imesa->numClipRects); - XF86DRIClipRectRec *box = imesa->pClipRects; + drm_clip_rect_t *box = imesa->pClipRects; drm_clip_rect_t *b = (drm_clip_rect_t *)imesa->sarea->boxes; int n = 0; @@ -533,7 +533,7 @@ static void i830Clear(GLcontext *ctx, GLbitfield mask, GLboolean all, void i830CopyBuffer( const __DRIdrawablePrivate *dPriv ) { i830ContextPtr imesa; - XF86DRIClipRectPtr pbox; + drm_clip_rect_t *pbox; int nbox, i, tmp; assert(dPriv); @@ -554,7 +554,7 @@ void i830CopyBuffer( const __DRIdrawablePrivate *dPriv ) for (i = 0 ; i < nbox ; ) { int nr = MIN2(i + I830_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; @@ -600,7 +600,7 @@ void i830PageFlip( const __DRIdrawablePrivate *dPriv ) imesa->perf_boxes = 0; if (dPriv->pClipRects) { - *(XF86DRIClipRectRec *)imesa->sarea->boxes = dPriv->pClipRects[0]; + *(drm_clip_rect_t *)imesa->sarea->boxes = dPriv->pClipRects[0]; imesa->sarea->nbox = 1; } @@ -702,7 +702,7 @@ static void age_imesa( i830ContextPtr imesa, int age ) void i830FlushPrimsLocked( i830ContextPtr imesa ) { - XF86DRIClipRectPtr pbox = (XF86DRIClipRectPtr)imesa->pClipRects; + drm_clip_rect_t *pbox = imesa->pClipRects; int nbox = imesa->numClipRects; drmBufPtr buffer = imesa->vertex_buffer; I830SAREAPtr sarea = imesa->sarea; @@ -750,7 +750,7 @@ void i830FlushPrimsLocked( i830ContextPtr imesa ) } for (i = 0 ; i < nbox ; i = nr ) { - XF86DRIClipRectPtr b = sarea->boxes; + drm_clip_rect_t *b = sarea->boxes; int j; nr = MIN2(i + I830_NR_SAREA_CLIPRECTS, nbox); diff --git a/src/mesa/drivers/dri/i830/server/i830_dri.h b/src/mesa/drivers/dri/i830/server/i830_dri.h index 69a4f678d2..f2a1a53874 100644 --- a/src/mesa/drivers/dri/i830/server/i830_dri.h +++ b/src/mesa/drivers/dri/i830/server/i830_dri.h @@ -82,7 +82,7 @@ typedef struct _I830SAREA { unsigned int dirty; unsigned int nbox; - XF86DRIClipRectRec boxes[I830_NR_SAREA_CLIPRECTS]; + drm_clip_rect_t boxes[I830_NR_SAREA_CLIPRECTS]; /* Maintain an LRU of contiguous regions of texture space. If * you think you own a region of texture memory, and it has an |