- updated

Changed files:
    xorg-xserver-server-glyph.patch -> 1.3

diff --git a/xorg-xserver-server-glyph.patch b/xorg-xserver-server-glyph.patch
index d29edd185527bfb156dbec6c6e63714608a63d8e..31ec7cd263f5d00b0066b09c0e9a5aec3329c0e1 100644 (file)
--- a/xorg-xserver-server-glyph.patch
+++ b/xorg-xserver-server-glyph.patch
@@ -1675,37 +1675,6 @@ index 809fb4b..fc04748 100644
                                        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