xserver: Branch 'master'

[Keith Packard]

 exa/exa_unaccel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25d1c6cd37cc4079adf7c4bad8d10678fb08b409
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Apr 26 11:04:38 2010 -0700

    Exa screen private has SavedSourceValidate, not SourceValidate
    
    Need to check the right field to see if there is a wrapped
    SourceValidate function.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 8fc9317..2f8c462 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -462,7 +462,7 @@ ExaSrcValidate(DrawablePtr pDrawable,
     REGION_UNION(pScreen, dst, dst, &reg);
     REGION_UNINIT(pScreen, &reg);
 
-    if (pExaScr->SourceValidate) {
+    if (pExaScr->SavedSourceValidate) {
         swap(pExaScr, pScreen, SourceValidate);
         pScreen->SourceValidate(pDrawable, x, y, width, height);
         swap(pExaScr, pScreen, SourceValidate);