xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 Jan 2014

xserver          commit c1ce807d9f18f215332d7eeb844e8c640f71c53c
libxcb           commit e7263931aff3e3450dc938ad465a7577f943549f
libxcb/xcb-proto commit d898fd39ad6c82207eb78666b2daad982dd757b5
randrproto       commit a4a6694c059d74247c16527eef4a0ec9f56bbef6
libxtrans        commit e1e6121a1638d43d9929589b4723da2b38cb6b44
fontconfig       commit e2b406053c2937799da8636c56b72a77998bcab0
mesa             commit 07149f0252c52b4ac58b6df4e307fd786b49b490

1 files changed, 135 insertions, 0 deletions

diff --git a/xorg-server/glamor/glamor_polylines.c b/xorg-server/glamor/glamor_polylines.c
new file mode 100644
index 000000000..e723e9500
--- /dev/null
+++ b/xorg-server/glamor/glamor_polylines.c
@@ -0,0 +1,135 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ * Copyright © 1998 Keith Packard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Eric Anholt <eric@anholt.net>
+ *
+ */
+
+#include "glamor_priv.h"
+
+/** @file glamor_polylines.c
+ *
+ * GC PolyFillRect implementation, taken straight from fb_fill.c
+ */
+
+/**
+ * glamor_poly_lines() checks if it can accelerate the lines as a group of
+ * horizontal or vertical lines (rectangles), and uses existing rectangle fill
+ * acceleration if so.
+ */
+static Bool
+_glamor_poly_lines(DrawablePtr drawable, GCPtr gc, int mode, int n,
+		   DDXPointPtr points, Bool fallback)
+{
+	xRectangle *rects;
+	int x1, x2, y1, y2;
+	int i;
+
+	/* Don't try to do wide lines or non-solid fill style. */
+	if (gc->lineWidth != 0) {
+		/* This ends up in miSetSpans, which is accelerated as well as we
+		 * can hope X wide lines will be.
+		 */
+		goto wide_line;
+	}
+	if (gc->lineStyle != LineSolid) {
+		glamor_fallback
+		    ("non-solid fill line style %d\n",
+		     gc->lineStyle);
+		goto fail;
+	}
+	rects = malloc(sizeof(xRectangle) * (n - 1));
+	x1 = points[0].x;
+	y1 = points[0].y;
+	/* If we have any non-horizontal/vertical, fall back. */
+	for (i = 0; i < n - 1; i++) {
+		if (mode == CoordModePrevious) {
+			x2 = x1 + points[i + 1].x;
+			y2 = y1 + points[i + 1].y;
+		} else {
+			x2 = points[i + 1].x;
+			y2 = points[i + 1].y;
+		}
+		if (x1 != x2 && y1 != y2) {
+			free(rects);
+			glamor_fallback("stub diagonal poly_line\n");
+			goto fail;
+		}
+		if (x1 < x2) {
+			rects[i].x = x1;
+			rects[i].width = x2 - x1 + 1;
+		} else {
+			rects[i].x = x2;
+			rects[i].width = x1 - x2 + 1;
+		}
+		if (y1 < y2) {
+			rects[i].y = y1;
+			rects[i].height = y2 - y1 + 1;
+		} else {
+			rects[i].y = y2;
+			rects[i].height = y1 - y2 + 1;
+		}
+
+		x1 = x2;
+		y1 = y2;
+	}
+	gc->ops->PolyFillRect(drawable, gc, n - 1, rects);
+	free(rects);
+	return TRUE;
+
+      fail:
+	if (!fallback
+	    && glamor_ddx_fallback_check_pixmap(drawable)
+	    && glamor_ddx_fallback_check_gc(gc))
+		return FALSE;
+
+	if (gc->lineWidth == 0) {
+		if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW)) {
+			if (glamor_prepare_access_gc(gc)) {
+				fbPolyLine(drawable, gc, mode, n, points);
+				glamor_finish_access_gc(gc);
+			}
+			glamor_finish_access(drawable, GLAMOR_ACCESS_RW);
+		}
+	} else {
+wide_line:
+		/* fb calls mi functions in the lineWidth != 0 case. */
+		fbPolyLine(drawable, gc, mode, n, points);
+	}
+	return TRUE;
+}
+
+void
+glamor_poly_lines(DrawablePtr drawable, GCPtr gc, int mode, int n,
+		  DDXPointPtr points)
+{
+	_glamor_poly_lines(drawable, gc, mode, n, points, TRUE);
+}
+
+Bool
+glamor_poly_lines_nf(DrawablePtr drawable, GCPtr gc, int mode, int n,
+		     DDXPointPtr points)
+{
+	return _glamor_poly_lines(drawable, gc, mode, n, points, FALSE);
+}