xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Mon Apr 26 08:44:32 PDT 2010
exa/exa_unaccel.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit daa6f9308fa57e41210f78d92dbdb3f1c8eae6ad
Author: Jerome Glisse <jglisse at redhat.com>
Date: Mon Apr 26 15:55:26 2010 +0200
exa: avoid calling non existent SourceValidate callback
In unaccel path we were unconditionaly calling the SourceValidate
callback but in some case it could be NULL. Check if we have a
valid callback before calling it.
Signed-off-by: Jerome Glisse <jglisse at redhat.com>
Acked-by: Michel Dänzer <michel at daenzer.net>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index db9ce9f..8159f2f 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -462,9 +462,11 @@ ExaSrcValidate(DrawablePtr pDrawable,
REGION_UNION(pScreen, dst, dst, ®);
REGION_UNINIT(pScreen, ®);
- swap(pExaScr, pScreen, SourceValidate);
- pScreen->SourceValidate(pDrawable, x, y, width, height);
- swap(pExaScr, pScreen, SourceValidate);
+ if (pScreen->SourceValidate) {
+ swap(pExaScr, pScreen, SourceValidate);
+ pScreen->SourceValidate(pDrawable, x, y, width, height);
+ swap(pExaScr, pScreen, SourceValidate);
+ }
}
static Bool
More information about the xorg-commit
mailing list