diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2003-12-07 23:53:32 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2003-12-07 23:53:32 +0000 |
| commit | 99ef0a03292e7dc6aa2465aaaa620f394d2c286b (patch) | |
| tree | 124750efb73a4fca431d5407a05ae3725ce27c55 /src/mesa/drivers/dri/radeon/radeon_ioctl.c | |
| parent | 273e52f86fa41564f573c8e84d013f995e01a8f0 (diff) | |
merge some more of the radeon DRI driver from the DRI trunk
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_ioctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/src/mesa/drivers/dri/radeon/radeon_ioctl.c index 4e1f451e70..d25a7d6e50 100644 --- a/src/mesa/drivers/dri/radeon/radeon_ioctl.c +++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.c @@ -803,7 +803,7 @@ void radeonCopyBuffer( const __DRIdrawablePrivate *dPriv ) radeonContextPtr rmesa; GLint nbox, i, ret; GLboolean missed_target; - uint64_t ust; + int64_t ust; assert(dPriv); assert(dPriv->driContextPriv); @@ -923,7 +923,8 @@ void radeonPageFlip( const __DRIdrawablePrivate *dPriv ) } RADEON_STATECHANGE( rmesa, ctx ); - rmesa->hw.ctx.cmd[CTX_RB3D_COLOROFFSET] = rmesa->state.color.drawOffset; + rmesa->hw.ctx.cmd[CTX_RB3D_COLOROFFSET] = rmesa->state.color.drawOffset + + rmesa->radeonScreen->fbLocation; rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] = rmesa->state.color.drawPitch; } |