[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20090224.git703acea1-15-g25c4b0e

[Lars-Peter Clausen]

The following commit has been merged in the master branch:
commit 6778d354a73f177ecde305a2b8977ccfc352f2bd
Author: Lars-Peter Clausen <lars at metafoo.de>
Date:   Mon May 4 23:53:19 2009 +0200

    Cleanup: Replace pix->devKind with exaGetPixmapPitch(pix)

diff --git a/src/glamo-draw.c b/src/glamo-draw.c
index 17c1e6b..ac801df 100644
--- a/src/glamo-draw.c
+++ b/src/glamo-draw.c
@@ -316,7 +316,7 @@ GLAMOExaPrepareSolid(PixmapPtr      pPix,
 				(unsigned int) pm));
 	op = GLAMOSolidRop[alu] << 8;
 	offset = exaGetPixmapOffset(pPix);
-	pitch = pPix->devKind;
+	pitch = exaGetPixmapPitch(pPix);
 
 	BEGIN_CMDQ(16);
 	OUT_REG(GLAMO_REG_2D_DST_ADDRL, offset & 0xffff);
@@ -388,10 +388,10 @@ GLAMOExaPrepareCopy(PixmapPtr       pSrc,
 	}
 
 	src_offset = exaGetPixmapOffset(pSrc);
-	src_pitch = pSrc->devKind;
+	src_pitch = exaGetPixmapPitch(pSrc);
 
 	dst_offset = exaGetPixmapOffset(pDst);
-	dst_pitch = pDst->devKind;
+	dst_pitch = exaGetPixmapPitch(pDst);
 
 	op = GLAMOBltRop[alu] << 8;
 
@@ -503,7 +503,7 @@ GLAMOExaUploadToScreen(PixmapPtr pDst,
 	int dst_pitch;
 
 	bpp = pDst->drawable.bitsPerPixel / 8;
-	dst_pitch = pDst->devKind;
+	dst_pitch = exaGetPixmapPitch(pDst);
 	dst_offset = pGlamo->exa->memoryBase + exaGetPixmapOffset(pDst)
 						+ x*bpp + y*dst_pitch;
 
@@ -531,7 +531,7 @@ GLAMOExaDownloadFromScreen(PixmapPtr pSrc,
 
     bpp = pSrc->drawable.bitsPerPixel;
 	bpp /= 8;
-	src_pitch = pSrc->devKind;
+	src_pitch = exaGetPixmapPitch(pSrc);
 	src = pGlamo->exa->memoryBase + exaGetPixmapOffset(pSrc) +
 						x*bpp + y*src_pitch;
 	dst_offset = (unsigned char*)dst;

-- 
xf86-video-glamo, SMedia Glamo video driver for X.Org