diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Cursors.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Rotate.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 7dce1abf3..fe9d7b067 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -103,9 +103,9 @@ xf86CrtcCreate (ScrnInfoPtr scrn, #endif crtc->rotation = RR_Rotate_0; crtc->desiredRotation = RR_Rotate_0; - PictureTransformInitIdentity (&crtc->crtc_to_framebuffer); - pict_f_transform_init_identity (&crtc->f_crtc_to_framebuffer); - pict_f_transform_init_identity (&crtc->f_framebuffer_to_crtc); + pixman_transform_init_identity (&crtc->crtc_to_framebuffer); + pixman_f_transform_init_identity (&crtc->f_crtc_to_framebuffer); + pixman_f_transform_init_identity (&crtc->f_framebuffer_to_crtc); crtc->filter = NULL; crtc->params = NULL; crtc->nparams = 0; diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index cd4f9e8af..a58b00184 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -329,7 +329,7 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y) struct pict_f_vector v; v.v[0] = x + ScreenPriv->HotX; v.v[1] = y + ScreenPriv->HotY; v.v[2] = 1; - pict_f_transform_point (&crtc->f_framebuffer_to_crtc, &v); + pixman_f_transform_point (&crtc->f_framebuffer_to_crtc, &v); x = floor (v.v[0] + 0.5); y = floor (v.v[1] + 0.5); /* diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index 865d59c41..07189a5ba 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -122,7 +122,7 @@ xf86RotateCrtcRedisplay (xf86CrtcPtr crtc, RegionPtr region) dst_box.x2 += crtc->filter_width >> 1; dst_box.y1 -= crtc->filter_height >> 1; dst_box.y2 += crtc->filter_height >> 1; - pict_f_transform_bounds (&crtc->f_framebuffer_to_crtc, &dst_box); + pixman_f_transform_bounds (&crtc->f_framebuffer_to_crtc, &dst_box); CompositePicture (PictOpSrc, src, NULL, dst, dst_box.x1, dst_box.y1, 0, 0, dst_box.x1, dst_box.y1, @@ -177,7 +177,7 @@ xf86CrtcDamageShadow (xf86CrtcPtr crtc) damage_box.x2 = crtc->mode.HDisplay; damage_box.y1 = 0; damage_box.y2 = crtc->mode.VDisplay; - if (!PictureTransformBounds (&damage_box, &crtc->crtc_to_framebuffer)) + if (!pixman_transform_bounds (&crtc->crtc_to_framebuffer, &damage_box)) { damage_box.x1 = 0; damage_box.y1 = 0; @@ -375,7 +375,7 @@ xf86CrtcFitsScreen (xf86CrtcPtr crtc, struct pict_f_transform *crtc_to_fb) b.x2 = crtc->mode.HDisplay; b.y2 = crtc->mode.VDisplay; if (crtc_to_fb) - pict_f_transform_bounds (crtc_to_fb, &b); + pixman_f_transform_bounds (crtc_to_fb, &b); else { b.x1 += crtc->x; b.y1 += crtc->y; @@ -532,7 +532,7 @@ xf86CrtcRotate (xf86CrtcPtr crtc) crtc->bounds.x2 = crtc->mode.HDisplay; crtc->bounds.y1 = 0; crtc->bounds.y2 = crtc->mode.VDisplay; - pict_f_transform_bounds (&f_crtc_to_fb, &crtc->bounds); + pixman_f_transform_bounds (&f_crtc_to_fb, &crtc->bounds); /* All done */ return TRUE; |