EXA: The "optimization" for using a fill operation instead of 1x1 copies

checked the destination drawable's dimensions (!) instead of the
    tile's. Really....
This commit is contained in:
Thomas Winischhofer 2005-10-20 21:45:40 +00:00
parent 15f56b203d
commit 1f43d218cc
6 changed files with 18 additions and 18 deletions

View File

@ -428,7 +428,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (w > 32767 || h > 32767)
return NullPixmap;
if (!pScrn->vtSema || pExaScr->swappedOut) {
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
} else {
@ -1225,7 +1225,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
STRACE;
tileWidth = pTile->drawable.width;
tileHeight = pTile->drawable.height;
if (pDrawable->width > pExaScr->info->card.maxX ||
pDrawable->height > pExaScr->info->card.maxY ||
tileWidth > pExaScr->info->card.maxX ||
@ -1237,7 +1237,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
/* If we're filling with a solid color, grab it out and go to
* FillRegionSolid, saving numerous copies.
*/
if (pDrawable->width == 1 && pDrawable->height == 1) {
if (tileWidth == 1 && tileHeight == 1) {
CARD32 pixel;
exaDrawableUseMemory(&pTile->drawable);

View File

@ -428,7 +428,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (w > 32767 || h > 32767)
return NullPixmap;
if (!pScrn->vtSema || pExaScr->swappedOut) {
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
} else {
@ -1225,7 +1225,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
STRACE;
tileWidth = pTile->drawable.width;
tileHeight = pTile->drawable.height;
if (pDrawable->width > pExaScr->info->card.maxX ||
pDrawable->height > pExaScr->info->card.maxY ||
tileWidth > pExaScr->info->card.maxX ||
@ -1237,7 +1237,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
/* If we're filling with a solid color, grab it out and go to
* FillRegionSolid, saving numerous copies.
*/
if (pDrawable->width == 1 && pDrawable->height == 1) {
if (tileWidth == 1 && tileHeight == 1) {
CARD32 pixel;
exaDrawableUseMemory(&pTile->drawable);

View File

@ -428,7 +428,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (w > 32767 || h > 32767)
return NullPixmap;
if (!pScrn->vtSema || pExaScr->swappedOut) {
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
} else {
@ -1225,7 +1225,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
STRACE;
tileWidth = pTile->drawable.width;
tileHeight = pTile->drawable.height;
if (pDrawable->width > pExaScr->info->card.maxX ||
pDrawable->height > pExaScr->info->card.maxY ||
tileWidth > pExaScr->info->card.maxX ||
@ -1237,7 +1237,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
/* If we're filling with a solid color, grab it out and go to
* FillRegionSolid, saving numerous copies.
*/
if (pDrawable->width == 1 && pDrawable->height == 1) {
if (tileWidth == 1 && tileHeight == 1) {
CARD32 pixel;
exaDrawableUseMemory(&pTile->drawable);

View File

@ -428,7 +428,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (w > 32767 || h > 32767)
return NullPixmap;
if (!pScrn->vtSema || pExaScr->swappedOut) {
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
} else {
@ -1225,7 +1225,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
STRACE;
tileWidth = pTile->drawable.width;
tileHeight = pTile->drawable.height;
if (pDrawable->width > pExaScr->info->card.maxX ||
pDrawable->height > pExaScr->info->card.maxY ||
tileWidth > pExaScr->info->card.maxX ||
@ -1237,7 +1237,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
/* If we're filling with a solid color, grab it out and go to
* FillRegionSolid, saving numerous copies.
*/
if (pDrawable->width == 1 && pDrawable->height == 1) {
if (tileWidth == 1 && tileHeight == 1) {
CARD32 pixel;
exaDrawableUseMemory(&pTile->drawable);

View File

@ -428,7 +428,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (w > 32767 || h > 32767)
return NullPixmap;
if (!pScrn->vtSema || pExaScr->swappedOut) {
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
} else {
@ -1225,7 +1225,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
STRACE;
tileWidth = pTile->drawable.width;
tileHeight = pTile->drawable.height;
if (pDrawable->width > pExaScr->info->card.maxX ||
pDrawable->height > pExaScr->info->card.maxY ||
tileWidth > pExaScr->info->card.maxX ||
@ -1237,7 +1237,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
/* If we're filling with a solid color, grab it out and go to
* FillRegionSolid, saving numerous copies.
*/
if (pDrawable->width == 1 && pDrawable->height == 1) {
if (tileWidth == 1 && tileHeight == 1) {
CARD32 pixel;
exaDrawableUseMemory(&pTile->drawable);

View File

@ -428,7 +428,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
if (w > 32767 || h > 32767)
return NullPixmap;
if (!pScrn->vtSema || pExaScr->swappedOut) {
pPixmap = pExaScr->SavedCreatePixmap(pScreen, w, h, depth);
} else {
@ -1225,7 +1225,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
STRACE;
tileWidth = pTile->drawable.width;
tileHeight = pTile->drawable.height;
if (pDrawable->width > pExaScr->info->card.maxX ||
pDrawable->height > pExaScr->info->card.maxY ||
tileWidth > pExaScr->info->card.maxX ||
@ -1237,7 +1237,7 @@ exaFillRegionTiled (DrawablePtr pDrawable,
/* If we're filling with a solid color, grab it out and go to
* FillRegionSolid, saving numerous copies.
*/
if (pDrawable->width == 1 && pDrawable->height == 1) {
if (tileWidth == 1 && tileHeight == 1) {
CARD32 pixel;
exaDrawableUseMemory(&pTile->drawable);