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/unichrome/server/via_dri.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/mesa/drivers/dri/unichrome/server/via_dri.c') diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.c b/src/mesa/drivers/dri/unichrome/server/via_dri.c index d82d7acc73..7ccb62bd06 100644 --- a/src/mesa/drivers/dri/unichrome/server/via_dri.c +++ b/src/mesa/drivers/dri/unichrome/server/via_dri.c @@ -48,7 +48,6 @@ #endif #include "dri_util.h" -#include "sarea.h" #include "via_context.h" #include "via_dri.h" @@ -190,9 +189,9 @@ static int VIADRIScreenInit(DRIDriverContext * ctx) int err; #if 0 - ctx->shared.SAREASize = ((sizeof(XF86DRISAREARec) + 0xfff) & 0x1000); + ctx->shared.SAREASize = ((sizeof(drm_sarea_t) + 0xfff) & 0x1000); #else - if (sizeof(XF86DRISAREARec)+sizeof(VIASAREAPriv) > SAREA_MAX) { + if (sizeof(drm_sarea_t)+sizeof(VIASAREAPriv) > SAREA_MAX) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Data does not fit in SAREA\n"); return FALSE; @@ -356,7 +355,7 @@ VIADRIFinishScreenInit(DRIDriverContext * ctx) VIASAREAPriv *saPriv; saPriv=(VIASAREAPriv*)(((char*)ctx->pSAREA) + - sizeof(XF86DRISAREARec)); + sizeof(drm_sarea_t)); assert(saPriv); memset(saPriv, 0, sizeof(*saPriv)); saPriv->CtxOwner = -1; @@ -367,7 +366,7 @@ VIADRIFinishScreenInit(DRIDriverContext * ctx) pVIADRI->height=ctx->shared.virtualHeight; pVIADRI->mem=ctx->shared.fbSize; pVIADRI->bytesPerPixel= (ctx->bpp+7) / 8; - pVIADRI->sarea_priv_offset = sizeof(XF86DRISAREARec); + pVIADRI->sarea_priv_offset = sizeof(drm_sarea_t); /* TODO */ pVIADRI->scrnX=pVIADRI->width; pVIADRI->scrnY=pVIADRI->height; @@ -380,7 +379,7 @@ static int VIADRIKernelInit(DRIDriverContext * ctx, VIAPtr pVia) { drmVIAInit drmInfo; memset(&drmInfo, 0, sizeof(drmVIAInit)); - drmInfo.sarea_priv_offset = sizeof(XF86DRISAREARec); + drmInfo.sarea_priv_offset = sizeof(drm_sarea_t); drmInfo.fb_offset = pVia->FrameBufferBase; drmInfo.mmio_offset = pVia->registerHandle; if (pVia->IsPCI) -- cgit v1.2.3