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/r128/server | |
| 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/r128/server')
| -rw-r--r-- | src/mesa/drivers/dri/r128/server/r128_dri.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/server/r128_sarea.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r128/server/r128_dri.c b/src/mesa/drivers/dri/r128/server/r128_dri.c index 633c5ad5b3..8fd6b6e77d 100644 --- a/src/mesa/drivers/dri/r128/server/r128_dri.c +++ b/src/mesa/drivers/dri/r128/server/r128_dri.c @@ -37,7 +37,6 @@ * */ -#include "sarea.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -49,7 +48,6 @@ #include "driver.h" #include "drm.h" -#include "sarea.h" #include "r128.h" #include "r128_dri.h" #include "r128_macros.h" @@ -465,7 +463,7 @@ static int R128DRIKernelInit(const DRIDriverContext *ctx) memset( &drmInfo, 0, sizeof(drmR128Init) ); drmInfo.func = DRM_R128_INIT_CCE; - drmInfo.sarea_priv_offset = sizeof(XF86DRISAREARec); + drmInfo.sarea_priv_offset = sizeof(drm_sarea_t); drmInfo.is_pci = info->IsPCI; drmInfo.cce_mode = info->CCEMode; drmInfo.cce_secure = info->CCESecure; @@ -888,7 +886,7 @@ static GLboolean R128DRIScreenInit(DRIDriverContext *ctx) R128SAREAPrivPtr pSAREAPriv; pSAREAPriv = (R128SAREAPrivPtr)(((char*)ctx->pSAREA) + - sizeof(XF86DRISAREARec)); + sizeof(drm_sarea_t)); memset(pSAREAPriv, 0, sizeof(*pSAREAPriv)); /* This is the struct passed to radeon_dri.so for its initialization */ @@ -923,7 +921,7 @@ static GLboolean R128DRIScreenInit(DRIDriverContext *ctx) pR128DRI->agpTexMapSize = info->agpTexMapSize; pR128DRI->log2AGPTexGran = info->log2AGPTexGran; pR128DRI->agpTexOffset = info->agpTexStart; - pR128DRI->sarea_priv_offset = sizeof(XF86DRISAREARec); + pR128DRI->sarea_priv_offset = sizeof(drm_sarea_t); return GL_TRUE; } diff --git a/src/mesa/drivers/dri/r128/server/r128_sarea.h b/src/mesa/drivers/dri/r128/server/r128_sarea.h index 8a9f3a4176..d5f431f12e 100644 --- a/src/mesa/drivers/dri/r128/server/r128_sarea.h +++ b/src/mesa/drivers/dri/r128/server/r128_sarea.h @@ -159,7 +159,7 @@ typedef struct { #if defined(XF86DRI) | defined(_SOLO) /* The current cliprects, or a subset thereof. */ - XF86DRIClipRectRec boxes[R128_NR_SAREA_CLIPRECTS]; + drm_clip_rect_t boxes[R128_NR_SAREA_CLIPRECTS]; unsigned int nbox; #endif |