Attachment 31634 Details for Bug 25343 – revert problematic changes

[patch] revert problematic changes

0002-Revert-exa-a-few-small-pitch-related-changes.patch (text/plain), 3.10 KB, created by Maarten Maathuis on 2009-12-01 12:50:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maarten Maathuis

Created: 2009-12-01 12:50:42 UTC

Size: 3.10 KB

patch

obsolete

>From 71ae950c87b5cc3b193db704cf9202ce146c43c2 Mon Sep 17 00:00:00 2001
>From: Maarten Maathuis <madman2003@gmail.com>
>Date: Tue, 1 Dec 2009 20:06:11 +0100
>Subject: [PATCH 2/4] Revert "exa: a few small pitch related changes"
>
>This reverts commit 99d88ef69d5f7dbf99ca605eceb92f42230a89f4.
>
>- Some pixmaps under classic have a sys_pitch which is 0, no idea why. This is
>causing rendering corruption.
>
>Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
>---
> exa/exa.c                 |   11 ++---------
> exa/exa_migration_mixed.c |   11 ++++++-----
> 2 files changed, 8 insertions(+), 14 deletions(-)
>
>diff --git a/exa/exa.c b/exa/exa.c
>index 16f39f6..023288c 100644
>--- a/exa/exa.c
>+++ b/exa/exa.c
>@@ -323,17 +323,10 @@ ExaDoPrepareAccess(PixmapPtr pPixmap, int index)
> 
>     has_gpu_copy = exaPixmapHasGpuCopy(pPixmap);
> 
>-    if (has_gpu_copy) {
>-	/* This can be NULL, but the driver prepareAccess call should
>-	 * take care of that. */
>+    if (has_gpu_copy && pExaPixmap->fb_ptr)
> 	pPixmap->devPrivate.ptr = pExaPixmap->fb_ptr;
>-	pPixmap->devKind = pExaPixmap->fb_pitch;
>-    } else {
>-	/* For mixed pixmaps this can be NULL, but that will be fixed
>-	 * later in exaPrepareAccessReg_mixed(). */
>+    else
> 	pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr;
>-	pPixmap->devKind = pExaPixmap->sys_pitch;
>-    }
> 
>     /* Store so we can handle repeated / nested calls. */
>     pExaScr->access[index].pixmap = pPixmap;
>diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
>index ee32b21..a7fdf63 100644
>--- a/exa/exa_migration_mixed.c
>+++ b/exa/exa_migration_mixed.c
>@@ -101,6 +101,7 @@ exaDoMigration_mixed(ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
> 	if (pExaPixmap->pDamage && exaPixmapHasGpuCopy(pPixmap)) {
> 	    ExaScreenPriv(pPixmap->drawable.pScreen);
> 
>+	    pPixmap->devKind = pExaPixmap->fb_pitch;
> 	    exaCopyDirtyToFb(pixmaps + i);
> 
> 	    if (pExaScr->deferred_mixed_pixmap == pPixmap)
>@@ -108,10 +109,6 @@ exaDoMigration_mixed(ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
> 	}
> 
> 	pExaPixmap->use_gpu_copy = exaPixmapHasGpuCopy(pPixmap);
>-	if (pExaPixmap->use_gpu_copy)
>-	    pPixmap->devKind = pExaPixmap->fb_pitch;
>-	else
>-	    pPixmap->devKind = pExaPixmap->sys_pitch;
>     }
> }
> 
>@@ -186,14 +183,17 @@ exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg)
> 		    pixmaps[0].as_src = TRUE;
> 		    pixmaps[0].pReg = NULL;
> 		}
>+		pPixmap->devKind = pExaPixmap->fb_pitch;
> 		exaCopyDirtyToSys(pixmaps);
> 	    }
> 
> 	    if (as_dst)
> 		exaPixmapDirty(pPixmap, 0, 0, pPixmap->drawable.width,
> 			       pPixmap->drawable.height);
>-	} else if (has_gpu_copy)
>+	} else if (has_gpu_copy) {
>+	    pPixmap->devKind = pExaPixmap->fb_pitch;
> 	    exaCopyDirtyToSys(pixmaps);
>+	}
> 
> 	pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr;
> 	pPixmap->devKind = pExaPixmap->sys_pitch;
>@@ -222,6 +222,7 @@ void exaFinishAccess_mixed(PixmapPtr pPixmap, int index)
> 		pExaScr->deferred_mixed_pixmap != pPixmap)
> 		exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap);
> 	    pExaScr->deferred_mixed_pixmap = pPixmap;
>+	    pPixmap->devKind = pExaPixmap->fb_pitch;
> 	} else
> 	    exaMoveInPixmap_mixed(pPixmap);
>     }
>-- 
>1.6.5.3
>

Actions: View | Splinter Review

Attachments on bug 25343: 31553 | 31634 | 31635

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.