From d40c16f5497739c0215f37566db1651a74cb20ba Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Sat, 23 Oct 2010 02:20:30 +0200 Subject: dri2: Fix build on X server 1.8. Signed-off-by: Francisco Jerez --- src/nouveau_dri2.c | 12 ++++++------ 1 file 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(®, &(BoxRec){ 0, 0, draw->width, draw->height }, 0); - RegionTranslate(®, draw->x, draw->y); + REGION_INIT(0, ®, (&(BoxRec){ 0, 0, draw->width, draw->height }), 0); + REGION_TRANSLATE(0, ®, 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(®)); + NV50SyncToVBlank(dst_pix, REGION_EXTENTS(0, ®)); else - NV11SyncToVBlank(dst_pix, RegionExtents(®)); + NV11SyncToVBlank(dst_pix, REGION_EXTENTS(0, ®)); FIRE_RING(chan); } if (can_exchange(draw, dst_pix, src_pix)) { type = DRI2_EXCHANGE_COMPLETE; - DamageRegionAppend (draw, ®); + DamageRegionAppend(draw, ®); 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(®, -draw->x, -draw->y); + REGION_TRANSLATE(0, ®, -draw->x, -draw->y); nouveau_dri2_copy_region(draw, ®, s->dst, s->src); } -- cgit v1.2.1