summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Defnet <benjamin.r.defnet@intel.com>2009-06-11 04:35:48 (GMT)
committerKeith Packard <keithp@keithp.com>2009-06-12 06:27:36 (GMT)
commitb2bf67b61c564a4b92a429ca9ad455403161f33a (patch)
tree94a9f02ec3880d74ad7d967de1318d44ca31e76f
parent3627215e97734cc367fff273a3358c2a95a53481 (diff)
randr: fix operation order so that rotation+transform works
The matrix multiply to combine rotation and projective transforms was being done in the wrong order. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--randr/rrtransform.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/randr/rrtransform.c b/randr/rrtransform.c
index 8bdff5a..06f6298 100644
--- a/randr/rrtransform.c
+++ b/randr/rrtransform.c
@@ -251,10 +251,10 @@ RRTransformCompute (int x,
#ifdef RANDR_12_INTERFACE
if (rr_transform)
{
- if (!pixman_transform_multiply (transform, transform, &rr_transform->transform))
+ if (!pixman_transform_multiply (transform, &rr_transform->transform, transform))
overflow = TRUE;
- pixman_f_transform_multiply (f_transform, f_transform, &rr_transform->f_transform);
- pixman_f_transform_multiply (f_inverse, &rr_transform->f_inverse, f_inverse);
+ pixman_f_transform_multiply (f_transform, &rr_transform->f_transform, f_transform);
+ pixman_f_transform_multiply (f_inverse, f_inverse, &rr_transform->f_inverse);
}
#endif
/*