diff options
| author | Eric Anholt <eric@anholt.net> | 2007-10-29 13:24:27 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-10-29 13:24:27 -0700 |
| commit | b0edb9c38a6c63175e4fafdbb54102c4f4a94e2c (patch) | |
| tree | 7dfa294a9c9f40f5f2e81a95dfd0d59cd4d6fbea /src/mesa/drivers/dri/r300/radeon_ioctl.c | |
| parent | 919f617d08a34d01dd916b08ca4f315bae84f21c (diff) | |
| parent | ad8ee7db3b406b23136873fc8c87a22e4d8b94de (diff) | |
Merge branch 'origin'
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_ioctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_ioctl.c b/src/mesa/drivers/dri/r300/radeon_ioctl.c index 0b8656b9c1..eeef71aaaf 100644 --- a/src/mesa/drivers/dri/r300/radeon_ioctl.c +++ b/src/mesa/drivers/dri/r300/radeon_ioctl.c @@ -157,7 +157,7 @@ static void radeonWaitForFrameCompletion(radeonContextPtr radeon) /* Copy the back color buffer to the front color buffer. */ -void radeonCopyBuffer(const __DRIdrawablePrivate * dPriv, +void radeonCopyBuffer(__DRIdrawablePrivate * dPriv, const drm_clip_rect_t * rect) { radeonContextPtr radeon; @@ -187,7 +187,7 @@ void radeonCopyBuffer(const __DRIdrawablePrivate * dPriv, if (!rect) { UNLOCK_HARDWARE(radeon); - driWaitForVBlank(dPriv, &radeon->vbl_seq, radeon->vblank_flags, + driWaitForVBlank(dPriv, &dPriv->vblSeq, dPriv->vblFlags, &missed_target); LOCK_HARDWARE(radeon); } @@ -253,7 +253,7 @@ void radeonCopyBuffer(const __DRIdrawablePrivate * dPriv, } } -void radeonPageFlip(const __DRIdrawablePrivate * dPriv) +void radeonPageFlip(__DRIdrawablePrivate * dPriv) { radeonContextPtr radeon; GLint ret; @@ -293,7 +293,7 @@ void radeonPageFlip(const __DRIdrawablePrivate * dPriv) */ radeonWaitForFrameCompletion(radeon); UNLOCK_HARDWARE(radeon); - driWaitForVBlank(dPriv, &radeon->vbl_seq, radeon->vblank_flags, + driWaitForVBlank(dPriv, &dPriv->vblSeq, dPriv->vblFlags, &missed_target); if (missed_target) { radeon->swap_missed_count++; |