diff options
| author | Jon Smirl <jonsmirl@gmail.com> | 2004-03-12 03:50:30 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@gmail.com> | 2004-03-12 03:50:30 +0000 |
| commit | ba5c49ab427d33915562b2c257db582c84eb7dd0 (patch) | |
| tree | 9b56fdc34fa42ac45653d6475568fc5ca316224b /src/mesa/drivers/dri/r128/r128_screen.c | |
| parent | 5fb0763d2ea6eeb12000f40b96ce556c35fe115f (diff) | |
Make R128 driver use sarea/defines from DRM. removed r128_common.h
and r128_sarea.h since they are redundant now.
Diffstat (limited to 'src/mesa/drivers/dri/r128/r128_screen.c')
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_screen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/r128/r128_screen.c b/src/mesa/drivers/dri/r128/r128_screen.c index ac8f185a45..f77c325db1 100644 --- a/src/mesa/drivers/dri/r128/r128_screen.c +++ b/src/mesa/drivers/dri/r128/r128_screen.c @@ -114,7 +114,7 @@ r128CreateScreen( __DRIscreenPrivate *sPriv ) r128Screen->sarea_priv_offset = r128DRIPriv->sarea_priv_offset; if (sPriv->drmMinor >= 3) { - drmR128GetParam gp; + drm_r128_getparam_t gp; int ret; gp.param = R128_PARAM_IRQ_NR; @@ -190,21 +190,21 @@ r128CreateScreen( __DRIscreenPrivate *sPriv ) r128Screen->depthPitch = r128DRIPriv->depthPitch; r128Screen->spanOffset = r128DRIPriv->spanOffset; - r128Screen->texOffset[R128_CARD_HEAP] = r128DRIPriv->textureOffset; - r128Screen->texSize[R128_CARD_HEAP] = r128DRIPriv->textureSize; - r128Screen->logTexGranularity[R128_CARD_HEAP] = r128DRIPriv->log2TexGran; + r128Screen->texOffset[R128_LOCAL_TEX_HEAP] = r128DRIPriv->textureOffset; + r128Screen->texSize[R128_LOCAL_TEX_HEAP] = r128DRIPriv->textureSize; + r128Screen->logTexGranularity[R128_LOCAL_TEX_HEAP] = r128DRIPriv->log2TexGran; if ( r128Screen->IsPCI ) { r128Screen->numTexHeaps = R128_NR_TEX_HEAPS - 1; - r128Screen->texOffset[R128_AGP_HEAP] = 0; - r128Screen->texSize[R128_AGP_HEAP] = 0; - r128Screen->logTexGranularity[R128_AGP_HEAP] = 0; + r128Screen->texOffset[R128_AGP_TEX_HEAP] = 0; + r128Screen->texSize[R128_AGP_TEX_HEAP] = 0; + r128Screen->logTexGranularity[R128_AGP_TEX_HEAP] = 0; } else { r128Screen->numTexHeaps = R128_NR_TEX_HEAPS; - r128Screen->texOffset[R128_AGP_HEAP] = + r128Screen->texOffset[R128_AGP_TEX_HEAP] = r128DRIPriv->agpTexOffset + R128_AGP_TEX_OFFSET; - r128Screen->texSize[R128_AGP_HEAP] = r128DRIPriv->agpTexMapSize; - r128Screen->logTexGranularity[R128_AGP_HEAP] = + r128Screen->texSize[R128_AGP_TEX_HEAP] = r128DRIPriv->agpTexMapSize; + r128Screen->logTexGranularity[R128_AGP_TEX_HEAP] = r128DRIPriv->log2AGPTexGran; } |