Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/common.py
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/state_tracker/st_format.c
	xorg-server/configure.ac
	xorg-server/exa/exa_unaccel.c

1 files changed, 1 insertions, 1 deletions

diff --git a/xorg-server/exa/exa_unaccel.c b/xorg-server/exa/exa_unaccel.c
index 1ed08d5b1..634d1a893 100644
--- a/xorg-server/exa/exa_unaccel.c
+++ b/xorg-server/exa/exa_unaccel.c
@@ -143,7 +143,7 @@ ExaCheckCopyNtoN (DrawablePtr pSrc, DrawablePtr pDst,  GCPtr pGC,
 	RegionInitBoxes (&reg, pbox, nbox)) {

 	PixmapPtr pPixmap = exaGetDrawablePixmap(pDst);

 

-	exaGetDrawableDeltas(pSrc, pPixmap, &xoff, &yoff);

+	exaGetDrawableDeltas(pDst, pPixmap, &xoff, &yoff);

 	RegionTranslate(&reg, xoff, yoff);

 	pExaScr->prepare_access_reg(pPixmap, EXA_PREPARE_DEST, &reg);

 	RegionUninit(&reg);