Attachment 43095 Details for Bug 33929 – Update GPU copy pitch in exaModifyPixmapHeader_mixed

[patch] Update GPU copy pitch in exaModifyPixmapHeader_mixed

fdo33929.diff (text/plain), 1.18 KB, created by Michel Dänzer on 2011-02-08 04:35:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2011-02-08 04:35:15 UTC

Size: 1.18 KB

patch

obsolete

>diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
>index 606f1e1..fd1afb2 100644
>--- a/exa/exa_mixed.c
>+++ b/exa/exa_mixed.c
>@@ -175,8 +175,10 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
> 	depth != pPixmap->drawable.depth ||
> 	bitsPerPixel != pPixmap->drawable.bitsPerPixel) {
> 	if (pExaPixmap->driverPriv) {
>-            exaSetFbPitch(pExaScr, pExaPixmap,
>-                          width, height, bitsPerPixel);
>+	    if (devKind > 0)
>+		pExaPixmap->fb_pitch = devKind;
>+	    else
>+		exaSetFbPitch(pExaScr, pExaPixmap, width, height, bitsPerPixel);
> 
>             exaSetAccelBlock(pExaScr, pExaPixmap,
>                              width, height, bitsPerPixel);
>@@ -187,8 +189,7 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
> 	if (has_gpu_copy && pExaPixmap->sys_ptr) {
> 	    free(pExaPixmap->sys_ptr);
> 	    pExaPixmap->sys_ptr = NULL;
>-	    pExaPixmap->sys_pitch = devKind > 0 ? devKind :
>-	        PixmapBytePad(width, depth);
>+	    pExaPixmap->sys_pitch = PixmapBytePad(width, depth);
> 	    DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
> 	    DamageDestroy(pExaPixmap->pDamage);
> 	    pExaPixmap->pDamage = NULL;

Actions: View | Splinter Review

Attachments on bug 33929: 43027 | 43028 | 43029 | 43030 | 43031 | 43095 | 53075

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.