summaryrefslogtreecommitdiff
path: root/src/sna/sna_trapezoids.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-02-09 19:15:20 +0000
committerroot <root@ivybridge.(none)>2013-02-10 10:24:12 +0000
commit3cbdfb54d1fcfed7745111e861e19b7bbac243cc (patch)
treec355f97cca41d34d66f1097b586198cc492a43c2 /src/sna/sna_trapezoids.c
parent42a6b25817985e22e7d462be87fbd97973d96a29 (diff)
sna: Backport to squeeze - Xorg-1.6, pixman-0.16, libdrm-2.4.21
The principle change is to switch to the old Privates API and undo the Region renames. The downside is that this ignores the critical bugfixes made to the xserver since xorg-1.6 - but I assume that whoever wants to run the latest hardware on the old xservers is also backporting those stability fixes... Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_trapezoids.c')
-rw-r--r--src/sna/sna_trapezoids.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index 406a6b31..c547fb5a 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -7046,6 +7046,7 @@ project_point_onto_grid(const xPointFixed *in,
out->y = dy + pixman_fixed_to_grid(in->y);
}
+#if HAS_PIXMAN_TRIANGLES
static inline bool
xTriangleValid(const xTriangle *t)
{
@@ -7988,3 +7989,4 @@ sna_composite_trifan(CARD8 op,
{
trifan_fallback(op, src, dst, maskFormat, xSrc, ySrc, n, points);
}
+#endif