summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-05-04 23:53:19 +0200
committerLars-Peter Clausen <lars@metafoo.de>2009-05-04 23:53:19 +0200
commit6778d354a73f177ecde305a2b8977ccfc352f2bd (patch)
treebde2955b067f6b55402a6d5a9baeed2a2f01889b
parent70ecd97401220d3fe2864b1aee5fb1399c7e534d (diff)
Cleanup: Replace pix->devKind with exaGetPixmapPitch(pix)
-rw-r--r--src/glamo-draw.c10
1 files changed, 5 insertions, 5 deletions
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;