From 4ecb9f05321f20fd293b6cdeb26a7d0aab4e728f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 30 Mar 2006 05:47:08 +0000 Subject: [PATCH] Fix up some incorrect pointers and clear screen --- src/mesa/drivers/dri/i915/server/intel_dri.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i915/server/intel_dri.c b/src/mesa/drivers/dri/i915/server/intel_dri.c index 6e32cb4177b..2fd4a13052f 100644 --- a/src/mesa/drivers/dri/i915/server/intel_dri.c +++ b/src/mesa/drivers/dri/i915/server/intel_dri.c @@ -617,13 +617,13 @@ static Bool I830ClearScreen(DRIDriverContext *ctx, I830Rec *pI830, drmI830Sarea *sarea) { /* need to drmMap front and back buffers and zero them */ - drmAddressPtr map_addr; + drmAddress map_addr; int ret; ret = drmMap(ctx->drmFD, sarea->front_handle, sarea->front_size, - map_addr); + &map_addr); if (ret) { @@ -640,7 +640,7 @@ I830ClearScreen(DRIDriverContext *ctx, I830Rec *pI830, drmI830Sarea *sarea) ret = drmMap(ctx->drmFD, sarea->back_handle, sarea->back_size, - map_addr); + &map_addr); if (ret) { @@ -810,14 +810,14 @@ I830ScreenInit(DRIDriverContext *ctx, I830Rec *pI830) if (err == FALSE) return FALSE; - I830SetRingRegs(ctx, pI830); - /* Quick hack to clear the front & back buffers. Could also use * the clear ioctl to do this, but would need to setup hw state * first. */ I830ClearScreen(ctx, pI830, pSAREAPriv); + I830SetRingRegs(ctx, pI830); + return TRUE; } -- 2.30.2