xserver/hw/xgl xglcopy.c,1.7,1.8

[Dave Airlie]

Committed by: airlied

Update of /cvs/xserver/xserver/hw/xgl
In directory gabe:/tmp/cvs-serv16305

Modified Files:
	xglcopy.c 
Log Message:
from davidr's tree update some fixes


Index: xglcopy.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglcopy.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xglcopy.c	7 Jun 2005 08:53:40 -0000	1.7
+++ xglcopy.c	23 Dec 2005 01:50:04 -0000	1.8
@@ -41,11 +41,19 @@
     if (!nBox)
 	return TRUE;
 
-    if (!xglPrepareTarget (pDst))
-	return FALSE;
-
-    if (!xglSyncSurface (pSrc))
-	return FALSE;
+    if (xglPrepareTarget (pDst))
+    {
+	if (!xglSyncSurface (pSrc))
+	    return FALSE;
+    }
+    else
+    {
+	if (!xglPrepareTarget (pSrc))
+	    return FALSE;
+	
+	if (!xglSyncSurface (pDst))
+	    return FALSE;
+    }
     
     XGL_GET_DRAWABLE (pSrc, src, srcXoff, srcYoff);
     XGL_GET_DRAWABLE (pDst, dst, dstXoff, dstYoff);