xserver: Branch 'master' - 2 commits

[Tilman Sauerbeck]

 exa/exa_unaccel.c   |    2 ++
 hw/xwin/Makefile.am |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree d5738ff2e0f93df4729c075ce31a1041d580e50e (from a0dafd95e1e13a2f1b77ab9f82fd365a7be19de5)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Mon Sep 17 16:59:03 2007 +0200

    EXA: Added missing exaPrepare/FinishAccess calls in ExaCheckPushPixels.

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index d487dc5..aecbfeb 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -258,9 +258,11 @@ ExaCheckPushPixels (GCPtr pGC, PixmapPtr
 		  exaDrawableLocation(&pBitmap->drawable),
 		  exaDrawableLocation(pDrawable)));
     exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
+    exaPrepareAccess (pBitmap, EXA_PREPARE_SRC);
     exaPrepareAccessGC (pGC);
     fbPushPixels (pGC, pBitmap, pDrawable, w, h, x, y);
     exaFinishAccessGC (pGC);
+    exaFinishAccess (pBitmap, EXA_PREPARE_SRC);
     exaFinishAccess (pDrawable, EXA_PREPARE_DEST);
 }
 
diff-tree a0dafd95e1e13a2f1b77ab9f82fd365a7be19de5 (from 7bd65577018a574970b767b67967b65fcd5c2bf0)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Mon Sep 17 16:45:20 2007 +0200

    Removed hw/xwin/winpntwin.c from Makefile.am.
    
    winpntwin.c was removed in e4d11e58ce349dfe6af2f73ff341317f9b39684c.

diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 8aaed8c..5ffba12 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -45,7 +45,6 @@ SRCS_NATIVEGDI = \
 	wingetsp.c \
 	winnativegdi.c \
 	winpixmap.c \
-	winpntwin.c \
 	winpolyline.c \
 	winpushpxl.c \
 	winrop.c \