diff options
| author | Jon Smirl <jonsmirl@gmail.com> | 2004-03-11 20:35:38 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@gmail.com> | 2004-03-11 20:35:38 +0000 |
| commit | ae4a1cc0666860bf5cc37a5cb549afc9aa5448b0 (patch) | |
| tree | 495f1f0249dc177e65f956e16ae79f7ab5a0cb83 /src/mesa/drivers/dri/mach64/mach64_ioctl.c | |
| parent | 157ec8bcf8b56d7951416d9ee13c98b7e82d099d (diff) | |
Adjustments to make everything use IOCTL/sarea defines in DRM instead
of glx/mini. removes glx/mini/drm.h glx/mini/sarea.h
Diffstat (limited to 'src/mesa/drivers/dri/mach64/mach64_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/mach64/mach64_ioctl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/mach64/mach64_ioctl.c b/src/mesa/drivers/dri/mach64/mach64_ioctl.c index 4c391fec24..19b0c26c4d 100644 --- a/src/mesa/drivers/dri/mach64/mach64_ioctl.c +++ b/src/mesa/drivers/dri/mach64/mach64_ioctl.c @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes <gareth@valinux.com> * Leif Delgass <ldelgass@retinalburn.net> - * José Fonseca <j_r_fonseca@yahoo.co.uk> + * Jos�Fonseca <j_r_fonseca@yahoo.co.uk> */ #include <errno.h> @@ -98,7 +98,7 @@ drmBufPtr mach64GetBufferLocked( mach64ContextPtr mmesa ) void mach64FlushVerticesLocked( mach64ContextPtr mmesa ) { - XF86DRIClipRectPtr pbox = mmesa->pClipRects; + drm_clip_rect_t *pbox = mmesa->pClipRects; int nbox = mmesa->numClipRects; void *buffer = mmesa->vert_buf; int count = mmesa->vert_used; @@ -144,7 +144,7 @@ void mach64FlushVerticesLocked( mach64ContextPtr mmesa ) for ( i = 0 ; i < nbox ; ) { int nr = MIN2( i + MACH64_NR_SAREA_CLIPRECTS, nbox ); - XF86DRIClipRectPtr b = mmesa->sarea->boxes; + drm_clip_rect_t *b = mmesa->sarea->boxes; int discard = 0; mmesa->sarea->nbox = nr - i; @@ -269,7 +269,7 @@ void mach64CopyBuffer( const __DRIdrawablePrivate *dPriv ) { mach64ContextPtr mmesa; GLint nbox, i, ret; - XF86DRIClipRectPtr pbox; + drm_clip_rect_t *pbox; GLboolean missed_target; assert(dPriv); @@ -315,7 +315,7 @@ void mach64CopyBuffer( const __DRIdrawablePrivate *dPriv ) for ( i = 0 ; i < nbox ; ) { GLint nr = MIN2( i + MACH64_NR_SAREA_CLIPRECTS , nbox ); - XF86DRIClipRectPtr b = mmesa->sarea->boxes; + drm_clip_rect_t *b = mmesa->sarea->boxes; GLint n = 0; for ( ; i < nr ; i++ ) { @@ -393,7 +393,7 @@ void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa ) GLuint color; GLint nbox; GLint x1, y1, x2, y2; - XF86DRIClipRectPtr b = mmesa->sarea->boxes; + drm_clip_rect_t *b = mmesa->sarea->boxes; /* save cliprects */ nbox = mmesa->sarea->nbox; @@ -719,8 +719,8 @@ static void mach64DDClear( GLcontext *ctx, GLbitfield mask, GLboolean all, for ( i = 0 ; i < mmesa->numClipRects ; ) { int nr = MIN2( i + MACH64_NR_SAREA_CLIPRECTS, mmesa->numClipRects ); - XF86DRIClipRectPtr box = mmesa->pClipRects; - XF86DRIClipRectPtr b = mmesa->sarea->boxes; + drm_clip_rect_t *box = mmesa->pClipRects; + drm_clip_rect_t *b = mmesa->sarea->boxes; GLint n = 0; if ( !all ) { |