diff options
Diffstat (limited to 'xorg-server/exa')
| -rw-r--r-- | xorg-server/exa/exa_accel.c | 2 | ||||
| -rw-r--r-- | xorg-server/exa/exa_migration.c | 12 | ||||
| -rw-r--r-- | xorg-server/exa/exa_render.c | 16 | ||||
| -rw-r--r-- | xorg-server/exa/makefile | 4 |
4 files changed, 19 insertions, 15 deletions
diff --git a/xorg-server/exa/exa_accel.c b/xorg-server/exa/exa_accel.c index dac6e6c79..9e65d74a1 100644 --- a/xorg-server/exa/exa_accel.c +++ b/xorg-server/exa/exa_accel.c @@ -258,7 +258,7 @@ exaPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, bits); } -static Bool inline +static Bool __inline exaCopyNtoNTwoDir (DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, BoxPtr pbox, int nbox, int dx, int dy) { diff --git a/xorg-server/exa/exa_migration.c b/xorg-server/exa/exa_migration.c index 4623eccdd..17dd87e4c 100644 --- a/xorg-server/exa/exa_migration.c +++ b/xorg-server/exa/exa_migration.c @@ -167,7 +167,7 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc, static Bool firsttime = TRUE; if (firsttime) { - ErrorF("%s: Pending damage region empty!\n", __func__); + ErrorF("%s: Pending damage region empty!\n", __FUNCTION__ ); firsttime = FALSE; } } @@ -353,8 +353,8 @@ exaDoMoveInPixmap (ExaMigrationPtr migrate) void exaMoveInPixmap (PixmapPtr pPixmap) { - static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE, - .pReg = NULL }; + static ExaMigrationRec migrate = { FALSE, TRUE, NULL, + NULL }; migrate.pPix = pPixmap; exaDoMoveInPixmap (&migrate); @@ -394,8 +394,8 @@ exaDoMoveOutPixmap (ExaMigrationPtr migrate) void exaMoveOutPixmap (PixmapPtr pPixmap) { - static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE, - .pReg = NULL }; + static ExaMigrationRec migrate = { FALSE, TRUE, NULL, + NULL }; migrate.pPix = pPixmap; exaDoMoveOutPixmap (&migrate); @@ -588,7 +588,7 @@ exaDoMigration (ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel) for (i = 0; i < npixmaps; i++) { if (!exaPixmapIsDirty (pixmaps[i].pPix) && !exaAssertNotDirty (pixmaps[i].pPix)) - ErrorF("%s: Pixmap %d dirty but not marked as such!\n", __func__, i); + ErrorF("%s: Pixmap %d dirty but not marked as such!\n", __FUNCTION__ , i); } } /* If anything is pinned in system memory, we won't be able to diff --git a/xorg-server/exa/exa_render.c b/xorg-server/exa/exa_render.c index 9a79b4781..e4fb13cf1 100644 --- a/xorg-server/exa/exa_render.c +++ b/xorg-server/exa/exa_render.c @@ -1054,15 +1054,15 @@ exaTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, BoxRec bounds; if (maskFormat) { + PicturePtr pPicture; + INT16 xDst, yDst; + INT16 xRel, yRel; + miTrapezoidBounds (ntrap, traps, &bounds); if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) return; - PicturePtr pPicture; - INT16 xDst, yDst; - INT16 xRel, yRel; - xDst = traps[0].left.p1.x >> 16; yDst = traps[0].left.p1.y >> 16; @@ -1118,15 +1118,15 @@ exaTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, BoxRec bounds; if (maskFormat) { + PicturePtr pPicture; + INT16 xDst, yDst; + INT16 xRel, yRel; + miTriangleBounds (ntri, tris, &bounds); if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) return; - PicturePtr pPicture; - INT16 xDst, yDst; - INT16 xRel, yRel; - xDst = tris[0].p1.x >> 16; yDst = tris[0].p1.y >> 16; diff --git a/xorg-server/exa/makefile b/xorg-server/exa/makefile new file mode 100644 index 000000000..0373a4be3 --- /dev/null +++ b/xorg-server/exa/makefile @@ -0,0 +1,4 @@ +CSRCS=exa.c exa_accel.c exa_migration.c exa_offscreen.c exa_render.c exa_unaccel.c
+
+LIBRARY=libexa
+
|