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

Remove more debugging leftovers.

This commit is contained in:
Eric Anholt 2006-02-02 20:51:54 +00:00
parent 3366b68365
commit ee3c7ccb17
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-02-02 Eric Anholt <anholt@FreeBSD.org>
* hw/xfree86/exa/exa_accel.c: (exaFillSpans), (exaCopyNtoN),
(exaPolyFillRect), (exaSolidBoxClipped), (exaImageGlyphBlt),
(exaCopyWindow), (exaFillRegionSolid), (exaFillRegionTiled),
(exaPaintWindow):
Remove more debugging leftovers.
2006-02-02 Eric Anholt <anholt@FreeBSD.org> 2006-02-02 Eric Anholt <anholt@FreeBSD.org>
reviewed by: zrusin reviewed by: zrusin

12
exa/exa_accel.c
View File

@ -33,8 +33,6 @@
#include "exa.h" #include "exa.h"
#include "cw.h" #include "cw.h"
#define STRACE
static void static void
exaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n, exaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n,
DDXPointPtr ppt, int *pwidth, int fSorted) DDXPointPtr ppt, int *pwidth, int fSorted)
@ -57,7 +55,6 @@ exaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n,
return; return;
} }
STRACE;
if (pGC->fillStyle != FillSolid || if (pGC->fillStyle != FillSolid ||
pDrawable->width > pExaScr->info->card.maxX || pDrawable->width > pExaScr->info->card.maxX ||
pDrawable->height > pExaScr->info->card.maxY || pDrawable->height > pExaScr->info->card.maxY ||
@ -147,7 +144,6 @@ exaCopyNtoN (DrawablePtr pSrcDrawable,
PixmapPtr pSrcPixmap, pDstPixmap; PixmapPtr pSrcPixmap, pDstPixmap;
int src_off_x, src_off_y; int src_off_x, src_off_y;
int dst_off_x, dst_off_y; int dst_off_x, dst_off_y;
STRACE;
/* Respect maxX/maxY in a trivial way: don't set up drawing when we might /* Respect maxX/maxY in a trivial way: don't set up drawing when we might
* violate the limits. The proper solution would be a temporary pixmap * violate the limits. The proper solution would be a temporary pixmap
@ -247,7 +243,6 @@ exaPolyFillRect(DrawablePtr pDrawable,
int xorg, yorg; int xorg, yorg;
int n; int n;
STRACE;
if (!pScrn->vtSema || if (!pScrn->vtSema ||
pGC->fillStyle != FillSolid || pGC->fillStyle != FillSolid ||
pDrawable->width > pExaScr->info->card.maxX || pDrawable->width > pExaScr->info->card.maxX ||
@ -353,7 +348,6 @@ exaSolidBoxClipped (DrawablePtr pDrawable,
int xoff, yoff; int xoff, yoff;
int partX1, partX2, partY1, partY2; int partX1, partX2, partY1, partY2;
STRACE;
if (!pScrn->vtSema || if (!pScrn->vtSema ||
pDrawable->width > pExaScr->info->card.maxX || pDrawable->width > pExaScr->info->card.maxX ||
pDrawable->height > pExaScr->info->card.maxY || pDrawable->height > pExaScr->info->card.maxY ||
@ -435,7 +429,6 @@ exaImageGlyphBlt (DrawablePtr pDrawable,
int dstXoff, dstYoff; int dstXoff, dstYoff;
FbBits depthMask; FbBits depthMask;
STRACE;
depthMask = FbFullMask(pDrawable->depth); depthMask = FbFullMask(pDrawable->depth);
if ((pGC->planemask & depthMask) != depthMask) if ((pGC->planemask & depthMask) != depthMask)
{ {
@ -579,7 +572,6 @@ exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
return; return;
} }
STRACE;
dx = ptOldOrg.x - pWin->drawable.x; dx = ptOldOrg.x - pWin->drawable.x;
dy = ptOldOrg.y - pWin->drawable.y; dy = ptOldOrg.y - pWin->drawable.y;
REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy); REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
@ -609,7 +601,6 @@ exaFillRegionSolid (DrawablePtr pDrawable,
PixmapPtr pPixmap; PixmapPtr pPixmap;
int xoff, yoff; int xoff, yoff;
STRACE;
if (pDrawable->width <= pExaScr->info->card.maxX && if (pDrawable->width <= pExaScr->info->card.maxX &&
pDrawable->height <= pExaScr->info->card.maxY && pDrawable->height <= pExaScr->info->card.maxY &&
(pPixmap = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff)) && (pPixmap = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff)) &&
@ -652,7 +643,6 @@ exaFillRegionTiled (DrawablePtr pDrawable,
int xoff, yoff; int xoff, yoff;
int tileWidth, tileHeight; int tileWidth, tileHeight;
STRACE;
tileWidth = pTile->drawable.width; tileWidth = pTile->drawable.width;
tileHeight = pTile->drawable.height; tileHeight = pTile->drawable.height;
@ -761,8 +751,6 @@ exaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
{ {
ScrnInfoPtr pScrn = XF86SCRNINFO(pWin->drawable.pScreen); ScrnInfoPtr pScrn = XF86SCRNINFO(pWin->drawable.pScreen);
STRACE;
if (!REGION_NUM_RECTS(pRegion)) if (!REGION_NUM_RECTS(pRegion))
return; return;
if (pScrn->vtSema) { if (pScrn->vtSema) {

12
hw/xfree86/exa/exa_accel.c
View File

@ -33,8 +33,6 @@
#include "exa.h" #include "exa.h"
#include "cw.h" #include "cw.h"
#define STRACE
static void static void
exaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n, exaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n,
DDXPointPtr ppt, int *pwidth, int fSorted) DDXPointPtr ppt, int *pwidth, int fSorted)
@ -57,7 +55,6 @@ exaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n,
return; return;
} }
STRACE;
if (pGC->fillStyle != FillSolid || if (pGC->fillStyle != FillSolid ||
pDrawable->width > pExaScr->info->card.maxX || pDrawable->width > pExaScr->info->card.maxX ||
pDrawable->height > pExaScr->info->card.maxY || pDrawable->height > pExaScr->info->card.maxY ||
@ -147,7 +144,6 @@ exaCopyNtoN (DrawablePtr pSrcDrawable,
PixmapPtr pSrcPixmap, pDstPixmap; PixmapPtr pSrcPixmap, pDstPixmap;
int src_off_x, src_off_y; int src_off_x, src_off_y;
int dst_off_x, dst_off_y; int dst_off_x, dst_off_y;
STRACE;
/* Respect maxX/maxY in a trivial way: don't set up drawing when we might /* Respect maxX/maxY in a trivial way: don't set up drawing when we might
* violate the limits. The proper solution would be a temporary pixmap * violate the limits. The proper solution would be a temporary pixmap
@ -247,7 +243,6 @@ exaPolyFillRect(DrawablePtr pDrawable,
int xorg, yorg; int xorg, yorg;
int n; int n;
STRACE;
if (!pScrn->vtSema || if (!pScrn->vtSema ||
pGC->fillStyle != FillSolid || pGC->fillStyle != FillSolid ||
pDrawable->width > pExaScr->info->card.maxX || pDrawable->width > pExaScr->info->card.maxX ||
@ -353,7 +348,6 @@ exaSolidBoxClipped (DrawablePtr pDrawable,
int xoff, yoff; int xoff, yoff;
int partX1, partX2, partY1, partY2; int partX1, partX2, partY1, partY2;
STRACE;
if (!pScrn->vtSema || if (!pScrn->vtSema ||
pDrawable->width > pExaScr->info->card.maxX || pDrawable->width > pExaScr->info->card.maxX ||
pDrawable->height > pExaScr->info->card.maxY || pDrawable->height > pExaScr->info->card.maxY ||
@ -435,7 +429,6 @@ exaImageGlyphBlt (DrawablePtr pDrawable,
int dstXoff, dstYoff; int dstXoff, dstYoff;
FbBits depthMask; FbBits depthMask;
STRACE;
depthMask = FbFullMask(pDrawable->depth); depthMask = FbFullMask(pDrawable->depth);
if ((pGC->planemask & depthMask) != depthMask) if ((pGC->planemask & depthMask) != depthMask)
{ {
@ -579,7 +572,6 @@ exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
return; return;
} }
STRACE;
dx = ptOldOrg.x - pWin->drawable.x; dx = ptOldOrg.x - pWin->drawable.x;
dy = ptOldOrg.y - pWin->drawable.y; dy = ptOldOrg.y - pWin->drawable.y;
REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy); REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
@ -609,7 +601,6 @@ exaFillRegionSolid (DrawablePtr pDrawable,
PixmapPtr pPixmap; PixmapPtr pPixmap;
int xoff, yoff; int xoff, yoff;
STRACE;
if (pDrawable->width <= pExaScr->info->card.maxX && if (pDrawable->width <= pExaScr->info->card.maxX &&
pDrawable->height <= pExaScr->info->card.maxY && pDrawable->height <= pExaScr->info->card.maxY &&
(pPixmap = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff)) && (pPixmap = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff)) &&
@ -652,7 +643,6 @@ exaFillRegionTiled (DrawablePtr pDrawable,
int xoff, yoff; int xoff, yoff;
int tileWidth, tileHeight; int tileWidth, tileHeight;
STRACE;
tileWidth = pTile->drawable.width; tileWidth = pTile->drawable.width;
tileHeight = pTile->drawable.height; tileHeight = pTile->drawable.height;
@ -761,8 +751,6 @@ exaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
{ {
ScrnInfoPtr pScrn = XF86SCRNINFO(pWin->drawable.pScreen); ScrnInfoPtr pScrn = XF86SCRNINFO(pWin->drawable.pScreen);
STRACE;
if (!REGION_NUM_RECTS(pRegion)) if (!REGION_NUM_RECTS(pRegion))
return; return;
if (pScrn->vtSema) { if (pScrn->vtSema) {