[PATCH 3/6] exa: same treatment for FinishAccess.

Maarten Maathuis madman2003 at gmail.com
Sun Mar 1 09:42:36 PST 2009


---
 exa/exa.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/exa/exa.c b/exa/exa.c
index 95f101f..37b7f74 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -629,10 +629,14 @@ exaFinishAccess(DrawablePtr pDrawable, int index)
     PixmapPtr	    pPixmap = exaGetDrawablePixmap (pDrawable);
     ExaPixmapPriv  (pPixmap);
 
-    /* Rehide pixmap pointer if we're doing that. */
-    if (pExaPixmap && !(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) {
-	pPixmap->devPrivate.ptr = NULL;
-    }
+    if (!(pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS))
+	return;
+
+    if (!pExaPixmap)
+	FatalError("Calling FinishAccess on a pixmap not known to exa.\n");
+
+    /* We always hide the devPrivate.ptr. */
+    pPixmap->devPrivate.ptr = NULL;
 
     if (pExaScr->info->FinishAccess == NULL)
 	return;
-- 
1.6.1.3



More information about the xorg-devel mailing list