From 0e6e75b04eaca311962390533acc03d0ac5ece83 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 26 Apr 2010 09:14:22 -0700 Subject: Revert "exa: avoid calling non existent SourceValidate callback" This reverts commit daa6f9308fa57e41210f78d92dbdb3f1c8eae6ad. This one checked pScreen->SourceValidate instead of pExaScr->SourceValidate which would cause a segfault when pExaScr->SourceValidate was NULL. --- exa/exa_unaccel.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'exa') diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c index 8159f2f26..db9ce9f56 100644 --- a/exa/exa_unaccel.c +++ b/exa/exa_unaccel.c @@ -462,11 +462,9 @@ ExaSrcValidate(DrawablePtr pDrawable, REGION_UNION(pScreen, dst, dst, ®); REGION_UNINIT(pScreen, ®); - if (pScreen->SourceValidate) { - swap(pExaScr, pScreen, SourceValidate); - pScreen->SourceValidate(pDrawable, x, y, width, height); - swap(pExaScr, pScreen, SourceValidate); - } + swap(pExaScr, pScreen, SourceValidate); + pScreen->SourceValidate(pDrawable, x, y, width, height); + swap(pExaScr, pScreen, SourceValidate); } static Bool -- cgit v1.2.3