Attachment 23207 Details for Bug 20212 – Possible fix, take four

[patch] Possible fix, take four

0001-EXA-Re-hide-pixmap-data-pointer-after-ModifyPixmapH.patch (text/plain), 2.89 KB, created by Michel Dänzer on 2009-02-23 04:02:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2009-02-23 04:02:09 UTC

Size: 2.89 KB

patch

obsolete

>From e1241b5035af7bff5d0a991a55706420a7a3fd59 Mon Sep 17 00:00:00 2001
>From: =?utf-8?q?Michel=20D=C3=A4nzer?= <daenzer@vmware.com>
>Date: Mon, 23 Feb 2009 12:48:26 +0100
>Subject: EXA: Re-hide pixmap data pointer after ModifyPixmapHeader().
>
>---
> exa/exa.c |   30 +++++++++++++++---------------
> 1 files changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/exa/exa.c b/exa/exa.c
>index 9329f10..96c67b9 100644
>--- a/exa/exa.c
>+++ b/exa/exa.c
>@@ -318,11 +318,6 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
> 
>         datasize = h * paddedWidth;
> 
>-	/* Set this before driver hooks, to allow for !offscreen pixmaps.
>-	 * !offscreen pixmaps have a valid pointer at all times.
>-	 */
>-	pPixmap->devPrivate.ptr = NULL;
>-
>         pExaPixmap->driverPriv = pExaScr->info->CreatePixmap(pScreen, datasize, 0);
>         if (!pExaPixmap->driverPriv) {
> 	    swap(pExaScr, pScreen, DestroyPixmap);
>@@ -336,7 +331,6 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
>         pExaPixmap->score = EXA_PIXMAP_SCORE_PINNED;
>         pExaPixmap->fb_ptr = NULL;
>         pExaPixmap->pDamage = NULL;
>-        pExaPixmap->sys_ptr = pPixmap->devPrivate.ptr;
> 
>     } else {
>         pExaPixmap->driverPriv = NULL;
>@@ -434,14 +428,20 @@ exaModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth,
>     }
> 
> 
>-    if (pExaScr->info->ModifyPixmapHeader) {
>+    if (pExaScr->info->ModifyPixmapHeader)
> 	ret = pExaScr->info->ModifyPixmapHeader(pPixmap, width, height, depth,
> 						bitsPerPixel, devKind, pPixData);
>-	if (ret == TRUE)
>-	    return ret;
>-    }
>-    return pExaScr->SavedModifyPixmapHeader(pPixmap, width, height, depth,
>-					    bitsPerPixel, devKind, pPixData);
>+    else
>+	ret = FALSE;
>+
>+    if (!ret)
>+	ret = pExaScr->SavedModifyPixmapHeader(pPixmap, width, height, depth,
>+					       bitsPerPixel, devKind, pPixData);
>+
>+    pExaPixmap->sys_ptr = pPixmap->devPrivate.ptr;
>+    pPixmap->devPrivate.ptr = NULL;
>+
>+    return ret;
> }
> 
> /**
>@@ -467,7 +467,7 @@ exaPixmapIsOffscreen(PixmapPtr p)
> 
>     save_ptr = p->devPrivate.ptr;
> 
>-    if (!save_ptr && pExaPixmap && !(pExaScr->info->flags & EXA_HANDLES_PIXMAPS))
>+    if (!save_ptr && pExaPixmap)
> 	p->devPrivate.ptr = ExaGetPixmapAddress(p);
> 
>     if (pExaScr->info->PixmapIsOffscreen)
>@@ -517,7 +517,7 @@ ExaDoPrepareAccess(DrawablePtr pDrawable, int index)
>     Bool	    offscreen = exaPixmapIsOffscreen(pPixmap);
> 
>     /* Unhide pixmap pointer */
>-    if (pPixmap->devPrivate.ptr == NULL && !(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) {
>+    if (pPixmap->devPrivate.ptr == NULL) {
> 	pPixmap->devPrivate.ptr = ExaGetPixmapAddress(pPixmap);
>     }
> 
>@@ -578,7 +578,7 @@ exaFinishAccess(DrawablePtr pDrawable, int index)
>     ExaPixmapPriv  (pPixmap);
> 
>     /* Rehide pixmap pointer if we're doing that. */
>-    if (pExaPixmap && !(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) {
>+    if (pExaPixmap) {
> 	pPixmap->devPrivate.ptr = NULL;
>     }
> 
>-- 
>1.6.2.rc1
>

Actions: View | Splinter Review

Attachments on bug 20212: 23112 | 23201 | 23205 | 23206 | 23207

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.