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/tdfx/Makefile.solo | 2 +- src/mesa/drivers/dri/tdfx/dri_glide.h | 2 +- src/mesa/drivers/dri/tdfx/tdfx_context.c | 2 +- src/mesa/drivers/dri/tdfx/tdfx_context.h | 6 +++--- src/mesa/drivers/dri/tdfx/tdfx_span.c | 6 +++--- src/mesa/drivers/dri/tdfx/tdfx_state.c | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/mesa/drivers/dri/tdfx') diff --git a/src/mesa/drivers/dri/tdfx/Makefile.solo b/src/mesa/drivers/dri/tdfx/Makefile.solo index 6b3a4cd78d..5c94009f44 100644 --- a/src/mesa/drivers/dri/tdfx/Makefile.solo +++ b/src/mesa/drivers/dri/tdfx/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/tdfx/dri_glide.h b/src/mesa/drivers/dri/tdfx/dri_glide.h index 0af560174e..df5a3ca24b 100644 --- a/src/mesa/drivers/dri/tdfx/dri_glide.h +++ b/src/mesa/drivers/dri/tdfx/dri_glide.h @@ -53,7 +53,7 @@ extern void grDRIOpen( char *pFB, char *pRegs, int deviceID, int textureOffset, int textureSize, volatile int *fifoPtr, volatile int *fifoRead ); extern void grDRIPosition( int x, int y, int w, int h, - int numClip, XF86DRIClipRectPtr pClip ); + int numClip, drm_clip_rect_t *pClip ); extern void grDRILostContext( void ); extern void grDRIImportFifo( int fifoPtr, int fifoRead ); extern void grDRIInvalidateAll( void ); diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c index 0cb5aa983f..fe23a15925 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_context.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c @@ -116,7 +116,7 @@ GLboolean tdfxCreateContext( const __GLcontextModes *mesaVis, __DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv; tdfxScreenPrivate *fxScreen = (tdfxScreenPrivate *) sPriv->private; TDFXSAREAPriv *saPriv = (TDFXSAREAPriv *) ((char *) sPriv->pSAREA + - sizeof(XF86DRISAREARec)); + sizeof(drm_sarea_t)); struct dd_function_table functions; /* Allocate tdfx context */ diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.h b/src/mesa/drivers/dri/tdfx/tdfx_context.h index 4bf813061e..42b725c8ec 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_context.h +++ b/src/mesa/drivers/dri/tdfx/tdfx_context.h @@ -769,7 +769,7 @@ struct tdfx_glide { int textureOffset, int textureSize, volatile int *fifoPtr, volatile int *fifoRead ); void (*grDRIPosition)( int x, int y, int w, int h, - int numClip, XF86DRIClipRectPtr pClip ); + int numClip, drm_clip_rect_t *pClip ); void (*grDRILostContext)( void ); void (*grDRIImportFifo)( int fifoPtr, int fifoRead ); void (*grDRIInvalidateAll)( void ); @@ -913,7 +913,7 @@ struct tdfx_context { __DRIcontextPrivate *driContext; __DRIdrawablePrivate *driDrawable; drmContext hHWContext; - drmLock *driHwLock; + drm_hw_lock_t *driHwLock; int driFd; tdfxScreenPrivate *fxScreen; TDFXSAREAPriv *sarea; @@ -928,7 +928,7 @@ struct tdfx_context { int y_delta; /* distance from window bottom to screen bottom */ int numClipRects; - XF86DRIClipRectPtr pClipRects; + drm_clip_rect_t *pClipRects; GLboolean scissoredClipRects; /* if true, pClipRects is private storage */ GuTexPalette glbPalette; /* global texture palette */ diff --git a/src/mesa/drivers/dri/tdfx/tdfx_span.c b/src/mesa/drivers/dri/tdfx/tdfx_span.c index d94ef699e8..4207d05dd3 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_span.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_span.c @@ -121,7 +121,7 @@ #define HW_READ_CLIPLOOP() \ do { \ const __DRIdrawablePrivate *dPriv = fxMesa->driDrawable; \ - XF86DRIClipRectPtr rect = dPriv->pClipRects; \ + drm_clip_rect_t *rect = dPriv->pClipRects; \ int _nc = dPriv->numClipRects; \ while (_nc--) { \ const int minx = rect->x1 - fxMesa->x_offset; \ @@ -284,7 +284,7 @@ generate_vismask(const tdfxContextPtr fxMesa, GLint x, GLint y, GLint n, /* turn on flags for all visible pixels */ for (i = 0; i < fxMesa->numClipRects; i++) { - const XF86DRIClipRectPtr rect = &fxMesa->pClipRects[i]; + const drm_clip_rect_t *rect = &fxMesa->pClipRects[i]; if (y >= rect->y1 && y < rect->y2) { if (x >= rect->x1 && x + n <= rect->x2) { @@ -324,7 +324,7 @@ visible_pixel(const tdfxContextPtr fxMesa, int scrX, int scrY) { int i; for (i = 0; i < fxMesa->numClipRects; i++) { - const XF86DRIClipRectPtr rect = &fxMesa->pClipRects[i]; + const drm_clip_rect_t *rect = &fxMesa->pClipRects[i]; if (scrX >= rect->x1 && scrX < rect->x2 && scrY >= rect->y1 && scrY < rect->y2) return GL_TRUE; diff --git a/src/mesa/drivers/dri/tdfx/tdfx_state.c b/src/mesa/drivers/dri/tdfx/tdfx_state.c index 7ef088ca69..5e59b91f80 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_state.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_state.c @@ -576,9 +576,9 @@ static void tdfxDDFogfv( GLcontext *ctx, GLenum pname, const GLfloat *param ) * Clipping */ -static int intersect_rect( XF86DRIClipRectPtr out, - const XF86DRIClipRectPtr a, - const XF86DRIClipRectPtr b) +static int intersect_rect( drm_clip_rect_t *out, + const drm_clip_rect_t *a, + const drm_clip_rect_t *b) { *out = *a; if (b->x1 > out->x1) out->x1 = b->x1; @@ -627,7 +627,7 @@ void tdfxUpdateClipping( GLcontext *ctx ) /* intersect OpenGL scissor box with all cliprects to make a new * list of cliprects. */ - XF86DRIClipRectRec scissor; + drm_clip_rect_t scissor; int x1 = ctx->Scissor.X + fxMesa->x_offset; int y1 = fxMesa->screen_height - fxMesa->y_delta - ctx->Scissor.Y - ctx->Scissor.Height; @@ -642,7 +642,7 @@ void tdfxUpdateClipping( GLcontext *ctx ) assert(scissor.y2 >= scissor.y1); fxMesa->pClipRects = malloc(dPriv->numClipRects - * sizeof(XF86DRIClipRectRec)); + * sizeof(drm_clip_rect_t)); if (fxMesa->pClipRects) { int i; fxMesa->numClipRects = 0; -- cgit v1.2.3