summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2007-10-02 13:01:07 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2007-10-03 18:39:39 +0200
commitce765a7fb77e12ff083a9068ec232a15bcf41f66 (patch)
tree3782401d00266989ab4d8ce6ad3b713cd479958c /src/mesa/drivers
parent07cd46d111b063ed37391ad7c316db9d7927ad03 (diff)
intel_winsys: Adapt to DRM changes (again).
It was decided after all to stick to 'pipes' here, even though the actual meaning is now 'planes'.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
index 48c1f68d9c..a6d0d43e4d 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
@@ -46,7 +46,7 @@
#define DRM_VBLANK_FLIP 0x8000000
typedef struct drm_i915_flip {
- int planes;
+ int pipes;
} drm_i915_flip_t;
#undef DRM_IOCTL_I915_FLIP
@@ -314,7 +314,7 @@ intelWindowMoved(struct intel_context *intel)
((intel_fb->pf_current_page + intel_fb->pf_num_pages - 1) %
intel_fb->pf_num_pages) << 2;
- flip.planes = 0x2;
+ flip.pipes = 0x2;
} else {
intel->sarea->pf_current_page =
intel->sarea->pf_current_page & (0x3 << 2);
@@ -322,7 +322,7 @@ intelWindowMoved(struct intel_context *intel)
(intel_fb->pf_current_page + intel_fb->pf_num_pages - 1) %
intel_fb->pf_num_pages;
- flip.planes = 0x1;
+ flip.pipes = 0x1;
}
drmCommandWrite(intel->driFd, DRM_I915_FLIP, &flip, sizeof(flip));
@@ -449,7 +449,7 @@ intelPageFlip(const __DRIdrawablePrivate * dPriv)
if (dPriv->numClipRects && intel_fb->pf_active) {
drm_i915_flip_t flip;
- flip.planes = intel_fb->pf_planes;
+ flip.pipes = intel_fb->pf_planes;
ret = drmCommandWrite(intel->driFd, DRM_I915_FLIP, &flip, sizeof(flip));
}