xserver/hw/xgl xglgc.c,1.5,1.6

David Reveman xserver-commit at pdx.freedesktop.org
Tue Mar 8 01:03:41 PST 2005


Committed by: davidr

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

Modified Files:
	xglgc.c 
Log Message:
Minor improvement to CopyArea in Xgl

Index: xglgc.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglgc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xglgc.c	26 Jan 2005 10:58:52 -0000	1.5
+++ xglgc.c	8 Mar 2005 09:03:38 -0000	1.6
@@ -196,9 +196,8 @@
 	     int	 dstX,
 	     int	 dstY)
 {
-    unsigned long flags;
-    RegionPtr	  pRegion;
-    BoxRec	  box;
+    RegionPtr pRegion;
+    BoxRec    box;
     
     XGL_GC_PRIV (pGC);
 
@@ -207,12 +206,7 @@
     box.x2 = box.x1 + w;
     box.y2 = box.y1 + h;
 
-    flags = pGCPriv->flags;
-
-    if (XGL_GET_DRAWABLE_PIXMAP_PRIV (pSrc)->target == xglPixmapTargetIn)
-	flags &= ~xglGCReadOnlyDrawableFlag;
-    
-    if (flags)
+    if (pGCPriv->flags &= ~xglGCReadOnlyDrawableFlag)
     {
 	if (!xglSyncBits (pSrc, &box))
 	    FatalError (XGL_SW_FAILURE_STRING);



More information about the xserver-commit mailing list