Merge remote-tracking branch 'origin/released'

* origin/released:
  xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 Jan 2014

Conflicts:
	X11/xtrans/Xtrans.c
	xorg-server/dix/dispatch.c
	xorg-server/os/xdmcp.c

1 files changed, 72 insertions, 0 deletions

diff --git a/xorg-server/glamor/glamor_copyplane.c b/xorg-server/glamor/glamor_copyplane.c
new file mode 100644
index 000000000..3f2652ac7
--- /dev/null
+++ b/xorg-server/glamor/glamor_copyplane.c
@@ -0,0 +1,72 @@
+/*
+ * 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:
+ *    Zhigang Gong <zhigang.gong@gmail.com>
+ *
+ */
+
+#include "glamor_priv.h"
+
+static Bool
+_glamor_copy_plane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+		   int srcx, int srcy, int w, int h, int dstx, int dsty,
+		   unsigned long bitPlane, RegionPtr *pRegion, Bool fallback)
+{
+	if (!fallback 
+	    && glamor_ddx_fallback_check_gc(pGC)
+	    && glamor_ddx_fallback_check_pixmap(pSrc)
+	    && glamor_ddx_fallback_check_pixmap(pDst))
+		goto fail;
+
+	glamor_prepare_access(pDst, GLAMOR_ACCESS_RW);
+	glamor_prepare_access(pSrc, GLAMOR_ACCESS_RO);
+	*pRegion = fbCopyPlane(pSrc, pDst, pGC, srcx, srcy, w, h,
+			  dstx, dsty, bitPlane);
+	glamor_finish_access(pSrc, GLAMOR_ACCESS_RO);
+	glamor_finish_access(pDst, GLAMOR_ACCESS_RW);
+	return TRUE;
+
+ fail:
+	return FALSE;
+}
+
+RegionPtr
+glamor_copy_plane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+		  int srcx, int srcy, int w, int h, int dstx, int dsty,
+		  unsigned long bitPlane)
+{
+	RegionPtr ret;
+	_glamor_copy_plane(pSrc, pDst, pGC, srcx, srcy, w, h,
+			   dstx, dsty, bitPlane, &ret, TRUE);
+	return ret;
+}
+
+Bool
+glamor_copy_plane_nf(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+		     int srcx, int srcy, int w, int h, int dstx, int dsty,
+		     unsigned long bitPlane, RegionPtr *pRegion)
+{
+	return _glamor_copy_plane(pSrc, pDst, pGC, srcx, srcy, w, h,
+				  dstx, dsty, bitPlane, pRegion, FALSE);
+}