SOURCES: xorg-xserver-server-glyph.patch - updated

[arekm]

Author: arekm                        Date: Thu Sep  4 07:09:32 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   xorg-xserver-server-glyph.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/xorg-xserver-server-glyph.patch
diff -u SOURCES/xorg-xserver-server-glyph.patch:1.2 
SOURCES/xorg-xserver-server-glyph.patch:1.3
--- SOURCES/xorg-xserver-server-glyph.patch:1.2 Wed Jul 23 21:19:43 2008
+++ SOURCES/xorg-xserver-server-glyph.patch     Thu Sep  4 09:09:26 2008
@@ -1675,37 +1675,6 @@
                                        pScreen, pPixmap);
  
      if (pExaPixmap->pDamage == NULL) {
-diff --git a/exa/exa_accel.c b/exa/exa_accel.c
-index edaec23..1dbb269 100644
---- a/exa/exa_accel.c
-+++ b/exa/exa_accel.c
-@@ -262,6 +262,7 @@ exaDoShmPutImage(DrawablePtr pDrawable, GCPtr pGC, int 
depth,
-     if (format == ZPixmap)
-     {
-       PixmapPtr pPixmap;
-+      ExaPixmapPriv(exaGetDrawablePixmap(pDrawable));
- 
-       pPixmap = GetScratchPixmapHeader(pDrawable->pScreen, w, h, depth,
-               BitsPerPixel(depth), PixmapBytePad(w, depth), (pointer)data);
-@@ -272,7 +273,8 @@ exaDoShmPutImage(DrawablePtr pDrawable, GCPtr pGC, int 
depth,
-                                 pGC->alu))
-           exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
-       else
--          ExaDoPrepareAccess (pDrawable, EXA_PREPARE_DEST);
-+          exaPrepareAccessReg (pDrawable, EXA_PREPARE_DEST,
-+                               DamagePendingRegion(pExaPixmap->pDamage));
-       fbCopyArea((DrawablePtr)pPixmap, pDrawable, pGC, sx, sy, sw, sh, dx, 
dy);
-       exaFinishAccess(pDrawable, EXA_PREPARE_DEST);
- 
-@@ -316,7 +318,7 @@ exaShmPutImage(DrawablePtr pDrawable, GCPtr pGC, int 
depth, unsigned int format,
-                                 pGC->alu))
-           exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
-       else
--          ExaDoPrepareAccess (pDrawable, EXA_PREPARE_DEST);
-+          exaPrepareAccessReg (pDrawable, EXA_PREPARE_DEST, &region);
-       fbShmPutImage(pDrawable, pGC, depth, format, w, h, sx, sy, sw, sh, dx, 
dy,
-                     data);
-       exaFinishAccess(pDrawable, EXA_PREPARE_DEST);
 diff --git a/exa/exa_migration.c b/exa/exa_migration.c
 index 5f22474..3c79f68 100644
 --- a/exa/exa_migration.c
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xorg-xserver-server-glyph.patch?r1=1.2&r2=1.3&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit