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/mga/server/mga_dri.c | 11 ++++------- src/mesa/drivers/dri/mga/server/mga_sarea.h | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'src/mesa/drivers/dri/mga/server') diff --git a/src/mesa/drivers/dri/mga/server/mga_dri.c b/src/mesa/drivers/dri/mga/server/mga_dri.c index 19ddb38510..eab4ab087a 100644 --- a/src/mesa/drivers/dri/mga/server/mga_dri.c +++ b/src/mesa/drivers/dri/mga/server/mga_dri.c @@ -43,9 +43,6 @@ #include "mga_dri.h" #include "mga_sarea.h" -#include "sarea.h" - - /* Quiescence, locking */ @@ -367,7 +364,7 @@ static int MGADRIKernelInit( struct DRIDriverContextRec *ctx, MGAPtr pMga ) memset( &init, 0, sizeof(drmMGAInit) ); init.func = MGA_INIT_DMA; - init.sarea_priv_offset = sizeof(XF86DRISAREARec); + init.sarea_priv_offset = sizeof(drm_sarea_t); switch ( pMga->Chipset ) { case PCI_CHIP_MGAG550: @@ -624,7 +621,7 @@ static void print_client_msg( MGADRIPtr pMGADRI ) pMGADRI->primary.size = pMga->primary.size; pMGADRI->buffers.handle = pMga->buffers.handle; pMGADRI->buffers.size = pMga->buffers.size; - pMGADRI->sarea_priv_offset = sizeof(XF86DRISAREARec); + pMGADRI->sarea_priv_offset = sizeof(drm_sarea_t); #endif } @@ -801,7 +798,7 @@ static int MGAScreenInit( struct DRIDriverContextRec *ctx, MGAPtr pMga ) { MGASAREAPrivPtr pSAREAPriv; pSAREAPriv = (MGASAREAPrivPtr)(((char*)ctx->pSAREA) + - sizeof(XF86DRISAREARec)); + sizeof(drm_sarea_t)); memset(pSAREAPriv, 0, sizeof(*pSAREAPriv)); } @@ -872,7 +869,7 @@ static int MGAScreenInit( struct DRIDriverContextRec *ctx, MGAPtr pMga ) pMGADRI->primary.size = pMga->primary.size; pMGADRI->buffers.handle = pMga->buffers.handle; pMGADRI->buffers.size = pMga->buffers.size; - pMGADRI->sarea_priv_offset = sizeof(XF86DRISAREARec); + pMGADRI->sarea_priv_offset = sizeof(drm_sarea_t); print_client_msg( pMGADRI ); diff --git a/src/mesa/drivers/dri/mga/server/mga_sarea.h b/src/mesa/drivers/dri/mga/server/mga_sarea.h index 8bfa3f51d5..747626d8ab 100644 --- a/src/mesa/drivers/dri/mga/server/mga_sarea.h +++ b/src/mesa/drivers/dri/mga/server/mga_sarea.h @@ -176,7 +176,7 @@ typedef struct { /* The current cliprects, or a subset thereof. */ - XF86DRIClipRectRec boxes[MGA_NR_SAREA_CLIPRECTS]; + drm_clip_rect_t boxes[MGA_NR_SAREA_CLIPRECTS]; unsigned int nbox; /* Information about the most recently used 3d drawable. The @@ -197,7 +197,7 @@ typedef struct { unsigned int exported_nback; int exported_back_x, exported_front_x, exported_w; int exported_back_y, exported_front_y, exported_h; - XF86DRIClipRectRec exported_boxes[MGA_NR_SAREA_CLIPRECTS]; + drm_clip_rect_t exported_boxes[MGA_NR_SAREA_CLIPRECTS]; /* Counters for aging textures and for client-side throttling. */ -- cgit v1.2.3