summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-10-23 02:20:30 +0200
committerFrancisco Jerez <currojerez@riseup.net>2010-10-24 03:12:04 +0200
commitd40c16f5497739c0215f37566db1651a74cb20ba (patch)
tree35b868511945b553a078889954592bc30b1a3ed4
parenta4d580bf05d7aac1d486e5d1ba9a2201c026e5f5 (diff)
downloadxorg-driver-xf86-video-nouveau-d40c16f5497739c0215f37566db1651a74cb20ba.tar.gz
dri2: Fix build on X server 1.8.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
-rw-r--r--src/nouveau_dri2.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
index 35146f2..65e7340 100644
--- a/src/nouveau_dri2.c
+++ b/src/nouveau_dri2.c
@@ -201,8 +201,8 @@ nouveau_dri2_finish_swap(DrawablePtr draw, unsigned int frame,
RegionRec reg;
int type, ret;
- RegionInit(&reg, &(BoxRec){ 0, 0, draw->width, draw->height }, 0);
- RegionTranslate(&reg, draw->x, draw->y);
+ REGION_INIT(0, &reg, (&(BoxRec){ 0, 0, draw->width, draw->height }), 0);
+ REGION_TRANSLATE(0, &reg, draw->x, draw->y);
/* Throttle on the previous frame before swapping */
nouveau_bo_map(dst_bo, NOUVEAU_BO_RD);
@@ -215,16 +215,16 @@ nouveau_dri2_finish_swap(DrawablePtr draw, unsigned int frame,
NOUVEAU_BO_VRAM | NOUVEAU_BO_RD, 0, 0);
if (pNv->Architecture >= NV_ARCH_50)
- NV50SyncToVBlank(dst_pix, RegionExtents(&reg));
+ NV50SyncToVBlank(dst_pix, REGION_EXTENTS(0, &reg));
else
- NV11SyncToVBlank(dst_pix, RegionExtents(&reg));
+ NV11SyncToVBlank(dst_pix, REGION_EXTENTS(0, &reg));
FIRE_RING(chan);
}
if (can_exchange(draw, dst_pix, src_pix)) {
type = DRI2_EXCHANGE_COMPLETE;
- DamageRegionAppend (draw, &reg);
+ DamageRegionAppend(draw, &reg);
if (DRI2CanFlip(draw)) {
type = DRI2_FLIP_COMPLETE;
@@ -239,7 +239,7 @@ nouveau_dri2_finish_swap(DrawablePtr draw, unsigned int frame,
DamageRegionProcessPending(draw);
} else {
type = DRI2_BLIT_COMPLETE;
- RegionTranslate(&reg, -draw->x, -draw->y);
+ REGION_TRANSLATE(0, &reg, -draw->x, -draw->y);
nouveau_dri2_copy_region(draw, &reg, s->dst, s->src);
}