frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exa: a few cleanups 

- Some warnings silenced.
- Some whitespace cleanup.
This commit is contained in:
Maarten Maathuis 2008-12-19 23:12:37 +01:00
parent aedd2f566d
commit 2db7b66863
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
exa/exa.c
View File

@ -72,7 +72,7 @@ exaGetPixmapOffset(PixmapPtr pPix)
{ {
ExaScreenPriv (pPix->drawable.pScreen); ExaScreenPriv (pPix->drawable.pScreen);
return ((unsigned long)ExaGetPixmapAddress(pPix) - return ((unsigned long)(unsigned long *)ExaGetPixmapAddress(pPix) -
(unsigned long)pExaScr->info->memoryBase); (unsigned long)pExaScr->info->memoryBase);
} }
@ -129,7 +129,7 @@ exaGetDrawablePixmap(DrawablePtr pDrawable)
return pDrawable->pScreen->GetWindowPixmap ((WindowPtr) pDrawable); return pDrawable->pScreen->GetWindowPixmap ((WindowPtr) pDrawable);
else else
return (PixmapPtr) pDrawable; return (PixmapPtr) pDrawable;
} }
/** /**
* Sets the offsets to add to coordinates to make them address the same bits in * Sets the offsets to add to coordinates to make them address the same bits in
@ -166,7 +166,7 @@ exaPixmapDirty (PixmapPtr pPix, int x1, int y1, int x2, int y2)
if (!pExaPixmap || !pExaPixmap->pDamage) if (!pExaPixmap || !pExaPixmap->pDamage)
return; return;
box.x1 = max(x1, 0); box.x1 = max(x1, 0);
box.y1 = max(y1, 0); box.y1 = max(y1, 0);
box.x2 = min(x2, pPix->drawable.width); box.x2 = min(x2, pPix->drawable.width);
@ -368,7 +368,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth,
/* This is used by exa to optimize migration. */ /* This is used by exa to optimize migration. */
DamageSetReportAfterOp (pExaPixmap->pDamage, TRUE); DamageSetReportAfterOp (pExaPixmap->pDamage, TRUE);
} }
pExaPixmap->area = NULL; pExaPixmap->area = NULL;
/* None of the pixmap bits are valid initially */ /* None of the pixmap bits are valid initially */
@ -691,11 +691,11 @@ exaChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
static RegionPtr static RegionPtr
exaBitmapToRegion(PixmapPtr pPix) exaBitmapToRegion(PixmapPtr pPix)
{ {
RegionPtr ret; RegionPtr ret;
exaPrepareAccess(&pPix->drawable, EXA_PREPARE_SRC); exaPrepareAccess(&pPix->drawable, EXA_PREPARE_SRC);
ret = fbPixmapToRegion(pPix); ret = fbPixmapToRegion(pPix);
exaFinishAccess(&pPix->drawable, EXA_PREPARE_SRC); exaFinishAccess(&pPix->drawable, EXA_PREPARE_SRC);
return ret; return ret;
} }
static Bool static Bool

16
exa/exa_render.c
View File

@ -1054,15 +1054,15 @@ exaTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
BoxRec bounds; BoxRec bounds;
if (maskFormat) { if (maskFormat) {
PicturePtr pPicture;
INT16 xDst, yDst;
INT16 xRel, yRel;
miTrapezoidBounds (ntrap, traps, &bounds); miTrapezoidBounds (ntrap, traps, &bounds);
if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
return; return;
PicturePtr pPicture;
INT16 xDst, yDst;
INT16 xRel, yRel;
xDst = traps[0].left.p1.x >> 16; xDst = traps[0].left.p1.x >> 16;
yDst = traps[0].left.p1.y >> 16; yDst = traps[0].left.p1.y >> 16;
@ -1118,15 +1118,15 @@ exaTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
BoxRec bounds; BoxRec bounds;
if (maskFormat) { if (maskFormat) {
PicturePtr pPicture;
INT16 xDst, yDst;
INT16 xRel, yRel;
miTriangleBounds (ntri, tris, &bounds); miTriangleBounds (ntri, tris, &bounds);
if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
return; return;
PicturePtr pPicture;
INT16 xDst, yDst;
INT16 xRel, yRel;
xDst = tris[0].p1.x >> 16; xDst = tris[0].p1.x >> 16;
yDst = tris[0].p1.y >> 16; yDst = tris[0].p1.y >> 16;