From ae4a1cc0666860bf5cc37a5cb549afc9aa5448b0 Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Thu, 11 Mar 2004 20:35:38 +0000 Subject: Adjustments to make everything use IOCTL/sarea defines in DRM instead of glx/mini. removes glx/mini/drm.h glx/mini/sarea.h --- src/mesa/drivers/dri/mach64/Makefile.solo | 2 +- src/mesa/drivers/dri/mach64/mach64_context.c | 4 ++-- src/mesa/drivers/dri/mach64/mach64_context.h | 12 ++++++------ src/mesa/drivers/dri/mach64/mach64_ioctl.c | 16 ++++++++-------- src/mesa/drivers/dri/mach64/mach64_state.c | 8 ++++---- src/mesa/drivers/dri/mach64/server/mach64_sarea.h | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/mesa/drivers/dri/mach64') diff --git a/src/mesa/drivers/dri/mach64/Makefile.solo b/src/mesa/drivers/dri/mach64/Makefile.solo index 9d6769917a..8815df6ccc 100644 --- a/src/mesa/drivers/dri/mach64/Makefile.solo +++ b/src/mesa/drivers/dri/mach64/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/mach64/mach64_context.c b/src/mesa/drivers/dri/mach64/mach64_context.c index c0ffb21bc2..771204153f 100644 --- a/src/mesa/drivers/dri/mach64/mach64_context.c +++ b/src/mesa/drivers/dri/mach64/mach64_context.c @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes * Leif Delgass - * José Fonseca + * Jos�Fonseca */ #include "glheader.h" @@ -144,7 +144,7 @@ GLboolean mach64CreateContext( const __GLcontextModes *glVisual, mach64Screen->driScreen->myNum, "mach64"); mmesa->sarea = (ATISAREAPrivPtr)((char *)driScreen->pSAREA + - sizeof(XF86DRISAREARec)); + sizeof(drm_sarea_t)); mmesa->CurrentTexObj[0] = NULL; mmesa->CurrentTexObj[1] = NULL; diff --git a/src/mesa/drivers/dri/mach64/mach64_context.h b/src/mesa/drivers/dri/mach64/mach64_context.h index 95c69270c5..92fea6e8eb 100644 --- a/src/mesa/drivers/dri/mach64/mach64_context.h +++ b/src/mesa/drivers/dri/mach64/mach64_context.h @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes * Leif Delgass - * José Fonseca + * Jos�Fonseca */ #ifndef __MACH64_CONTEXT_H__ @@ -158,7 +158,7 @@ typedef void (*mach64_line_func)( mach64ContextPtr, typedef void (*mach64_point_func)( mach64ContextPtr, mach64Vertex * ); -#if TEXMEM +#ifdef TEXMEM struct mach64_texture_object { driTextureObject base; @@ -253,7 +253,7 @@ struct mach64_context { /* Texture object bookkeeping */ mach64TexObjPtr CurrentTexObj[2]; -#if TEXMEM +#ifdef TEXMEM unsigned nr_heaps; driTexHeap * texture_heaps[ R128_NR_TEX_HEAPS ]; driTextureObject swapped; @@ -290,10 +290,10 @@ struct mach64_context { GLint readOffset, readPitch; GLuint numClipRects; /* Cliprects for the draw buffer */ - XF86DRIClipRectPtr pClipRects; + drm_clip_rect_t *pClipRects; GLint scissor; - XF86DRIClipRectRec ScissorRect; /* Current software scissor */ + drm_clip_rect_t ScissorRect; /* Current software scissor */ /* Mirrors of some DRI state */ @@ -304,7 +304,7 @@ struct mach64_context { unsigned int lastStamp; /* mirror driDrawable->lastStamp */ drmContext hHWContext; - drmLock *driHwLock; + drm_hw_lock_t *driHwLock; int driFd; mach64ScreenPtr mach64Screen; /* Screen private DRI data */ 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 * Leif Delgass - * José Fonseca + * Jos�Fonseca */ #include @@ -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 ) { diff --git a/src/mesa/drivers/dri/mach64/mach64_state.c b/src/mesa/drivers/dri/mach64/mach64_state.c index 2c8e20d573..9c37d85490 100644 --- a/src/mesa/drivers/dri/mach64/mach64_state.c +++ b/src/mesa/drivers/dri/mach64/mach64_state.c @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes * Leif Delgass - * José Fonseca + * Jos�Fonseca */ #include "mach64_context.h" @@ -694,19 +694,19 @@ void mach64SetCliprects( GLcontext *ctx, GLenum mode ) switch ( mode ) { case GL_FRONT_LEFT: mmesa->numClipRects = dPriv->numClipRects; - mmesa->pClipRects = (XF86DRIClipRectPtr)dPriv->pClipRects; + mmesa->pClipRects = dPriv->pClipRects; mmesa->drawX = dPriv->x; mmesa->drawY = dPriv->y; break; case GL_BACK_LEFT: if ( dPriv->numBackClipRects == 0 ) { mmesa->numClipRects = dPriv->numClipRects; - mmesa->pClipRects = (XF86DRIClipRectPtr)dPriv->pClipRects; + mmesa->pClipRects = dPriv->pClipRects; mmesa->drawX = dPriv->x; mmesa->drawY = dPriv->y; } else { mmesa->numClipRects = dPriv->numBackClipRects; - mmesa->pClipRects = (XF86DRIClipRectPtr)dPriv->pBackClipRects; + mmesa->pClipRects = dPriv->pBackClipRects; mmesa->drawX = dPriv->backX; mmesa->drawY = dPriv->backY; } diff --git a/src/mesa/drivers/dri/mach64/server/mach64_sarea.h b/src/mesa/drivers/dri/mach64/server/mach64_sarea.h index 31323fa68e..a519cde18a 100644 --- a/src/mesa/drivers/dri/mach64/server/mach64_sarea.h +++ b/src/mesa/drivers/dri/mach64/server/mach64_sarea.h @@ -130,7 +130,7 @@ typedef struct { /* The current cliprects, or a subset thereof. */ - XF86DRIClipRectRec boxes[MACH64_NR_SAREA_CLIPRECTS]; + drm_clip_rect_t boxes[MACH64_NR_SAREA_CLIPRECTS]; unsigned int nbox; /* Counter for throttling of rendering clients. -- cgit v1.2.3