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

Clients tend to set picture->repeat when not necessary. Most HW cannot 

accelerate repeat NPOT thus triggering software fallback (this is the
    case with gnome desktop for example). This adds a simple optimisation
    to exa that removes "repeat" when it's obviously useless, that is, the
    single picture instance covers the entire rectangle beeing used
This commit is contained in:
Benjamin Herrenschmidt 2005-10-06 23:45:29 +00:00
parent e4ed43c3a6
commit ff258ac278
3 changed files with 72 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
exa/exa_render.c
View File

@ -453,6 +453,8 @@ exaComposite(CARD8 op,
ExaScreenPriv (pDst->pDrawable->pScreen); ExaScreenPriv (pDst->pDrawable->pScreen);
int ret = -1; int ret = -1;
ScrnInfoPtr pScrn = XF86SCRNINFO(pDst->pDrawable->pScreen); ScrnInfoPtr pScrn = XF86SCRNINFO(pDst->pDrawable->pScreen);
Bool saveSrcRepeat = pSrc->repeat;
Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
if (!pScrn->vtSema) { if (!pScrn->vtSema) {
exaDrawableDirty(pDst->pDrawable); exaDrawableDirty(pDst->pDrawable);
@ -479,6 +481,12 @@ exaComposite(CARD8 op,
break; break;
} }
/* Remove repeat in source if useless */
if (pSrc->repeat && !pSrc->transform && xSrc >= 0 &&
(xSrc + width) <= pSrc->pDrawable->width && ySrc >= 0 &&
(ySrc + height) <= pSrc->pDrawable->height)
pSrc->repeat = 0;
if (!pMask && pSrc->pDrawable) if (!pMask && pSrc->pDrawable)
{ {
if (op == PictOpSrc) if (op == PictOpSrc)
@ -489,7 +497,7 @@ exaComposite(CARD8 op,
ret = exaTryDriverSolidFill(pSrc, pDst, xSrc, ySrc, xDst, yDst, ret = exaTryDriverSolidFill(pSrc, pDst, xSrc, ySrc, xDst, yDst,
width, height); width, height);
if (ret == 1) if (ret == 1)
return; goto bail;
} }
else if (!pSrc->repeat && !pSrc->transform && else if (!pSrc->repeat && !pSrc->transform &&
pSrc->format == pDst->format) pSrc->format == pDst->format)
@ -504,7 +512,7 @@ exaComposite(CARD8 op,
if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst, if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst,
xSrc, ySrc, xMask, yMask, xDst, xSrc, ySrc, xMask, yMask, xDst,
yDst, width, height)) yDst, width, height))
return; goto bail;
exaCopyNtoN (pSrc->pDrawable, pDst->pDrawable, NULL, exaCopyNtoN (pSrc->pDrawable, pDst->pDrawable, NULL,
@ -512,11 +520,18 @@ exaComposite(CARD8 op,
xSrc - xDst, ySrc - yDst, xSrc - xDst, ySrc - yDst,
FALSE, FALSE, 0, NULL); FALSE, FALSE, 0, NULL);
REGION_UNINIT(pDst->pDrawable->pScreen, &region); REGION_UNINIT(pDst->pDrawable->pScreen, &region);
return; goto bail;
} }
} }
} }
/* Remove repeat in mask if useless */
if (pMask && pMask->repeat && !pMask->transform && xMask >= 0 &&
(xMask + width) <= pMask->pDrawable->width && yMask >= 0 &&
(yMask + height) <= pMask->pDrawable->height)
pMask->repeat = 0;
if (pSrc->pDrawable && (!pMask || pMask->pDrawable) && if (pSrc->pDrawable && (!pMask || pMask->pDrawable) &&
pExaScr->info->accel.PrepareComposite && pExaScr->info->accel.PrepareComposite &&
!pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap) !pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap)
@ -524,7 +539,7 @@ exaComposite(CARD8 op,
ret = exaTryDriverComposite(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, ret = exaTryDriverComposite(op, pSrc, pMask, pDst, xSrc, ySrc, xMask,
yMask, xDst, yDst, width, height); yMask, xDst, yDst, width, height);
if (ret == 1) if (ret == 1)
return; goto bail;
} }
if (ret != 0) { if (ret != 0) {
@ -543,6 +558,11 @@ exaComposite(CARD8 op,
ExaCheckComposite (op, pSrc, pMask, pDst, xSrc, ySrc, ExaCheckComposite (op, pSrc, pMask, pDst, xSrc, ySrc,
xMask, yMask, xDst, yDst, width, height); xMask, yMask, xDst, yDst, width, height);
bail:
pSrc->repeat = saveSrcRepeat;
if (pMask)
pMask->repeat = saveMaskRepeat;
} }
#endif #endif

28
hw/xfree86/exa/exa_render.c
View File

@ -453,6 +453,8 @@ exaComposite(CARD8 op,
ExaScreenPriv (pDst->pDrawable->pScreen); ExaScreenPriv (pDst->pDrawable->pScreen);
int ret = -1; int ret = -1;
ScrnInfoPtr pScrn = XF86SCRNINFO(pDst->pDrawable->pScreen); ScrnInfoPtr pScrn = XF86SCRNINFO(pDst->pDrawable->pScreen);
Bool saveSrcRepeat = pSrc->repeat;
Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
if (!pScrn->vtSema) { if (!pScrn->vtSema) {
exaDrawableDirty(pDst->pDrawable); exaDrawableDirty(pDst->pDrawable);
@ -479,6 +481,12 @@ exaComposite(CARD8 op,
break; break;
} }
/* Remove repeat in source if useless */
if (pSrc->repeat && !pSrc->transform && xSrc >= 0 &&
(xSrc + width) <= pSrc->pDrawable->width && ySrc >= 0 &&
(ySrc + height) <= pSrc->pDrawable->height)
pSrc->repeat = 0;
if (!pMask && pSrc->pDrawable) if (!pMask && pSrc->pDrawable)
{ {
if (op == PictOpSrc) if (op == PictOpSrc)
@ -489,7 +497,7 @@ exaComposite(CARD8 op,
ret = exaTryDriverSolidFill(pSrc, pDst, xSrc, ySrc, xDst, yDst, ret = exaTryDriverSolidFill(pSrc, pDst, xSrc, ySrc, xDst, yDst,
width, height); width, height);
if (ret == 1) if (ret == 1)
return; goto bail;
} }
else if (!pSrc->repeat && !pSrc->transform && else if (!pSrc->repeat && !pSrc->transform &&
pSrc->format == pDst->format) pSrc->format == pDst->format)
@ -504,7 +512,7 @@ exaComposite(CARD8 op,
if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst, if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst,
xSrc, ySrc, xMask, yMask, xDst, xSrc, ySrc, xMask, yMask, xDst,
yDst, width, height)) yDst, width, height))
return; goto bail;
exaCopyNtoN (pSrc->pDrawable, pDst->pDrawable, NULL, exaCopyNtoN (pSrc->pDrawable, pDst->pDrawable, NULL,
@ -512,11 +520,18 @@ exaComposite(CARD8 op,
xSrc - xDst, ySrc - yDst, xSrc - xDst, ySrc - yDst,
FALSE, FALSE, 0, NULL); FALSE, FALSE, 0, NULL);
REGION_UNINIT(pDst->pDrawable->pScreen, &region); REGION_UNINIT(pDst->pDrawable->pScreen, &region);
return; goto bail;
} }
} }
} }
/* Remove repeat in mask if useless */
if (pMask && pMask->repeat && !pMask->transform && xMask >= 0 &&
(xMask + width) <= pMask->pDrawable->width && yMask >= 0 &&
(yMask + height) <= pMask->pDrawable->height)
pMask->repeat = 0;
if (pSrc->pDrawable && (!pMask || pMask->pDrawable) && if (pSrc->pDrawable && (!pMask || pMask->pDrawable) &&
pExaScr->info->accel.PrepareComposite && pExaScr->info->accel.PrepareComposite &&
!pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap) !pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap)
@ -524,7 +539,7 @@ exaComposite(CARD8 op,
ret = exaTryDriverComposite(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, ret = exaTryDriverComposite(op, pSrc, pMask, pDst, xSrc, ySrc, xMask,
yMask, xDst, yDst, width, height); yMask, xDst, yDst, width, height);
if (ret == 1) if (ret == 1)
return; goto bail;
} }
if (ret != 0) { if (ret != 0) {
@ -543,6 +558,11 @@ exaComposite(CARD8 op,
ExaCheckComposite (op, pSrc, pMask, pDst, xSrc, ySrc, ExaCheckComposite (op, pSrc, pMask, pDst, xSrc, ySrc,
xMask, yMask, xDst, yDst, width, height); xMask, yMask, xDst, yDst, width, height);
bail:
pSrc->repeat = saveSrcRepeat;
if (pMask)
pMask->repeat = saveMaskRepeat;
} }
#endif #endif

28
hw/xfree86/exa/exapict.c
View File

@ -453,6 +453,8 @@ exaComposite(CARD8 op,
ExaScreenPriv (pDst->pDrawable->pScreen); ExaScreenPriv (pDst->pDrawable->pScreen);
int ret = -1; int ret = -1;
ScrnInfoPtr pScrn = XF86SCRNINFO(pDst->pDrawable->pScreen); ScrnInfoPtr pScrn = XF86SCRNINFO(pDst->pDrawable->pScreen);
Bool saveSrcRepeat = pSrc->repeat;
Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
if (!pScrn->vtSema) { if (!pScrn->vtSema) {
exaDrawableDirty(pDst->pDrawable); exaDrawableDirty(pDst->pDrawable);
@ -479,6 +481,12 @@ exaComposite(CARD8 op,
break; break;
} }
/* Remove repeat in source if useless */
if (pSrc->repeat && !pSrc->transform && xSrc >= 0 &&
(xSrc + width) <= pSrc->pDrawable->width && ySrc >= 0 &&
(ySrc + height) <= pSrc->pDrawable->height)
pSrc->repeat = 0;
if (!pMask && pSrc->pDrawable) if (!pMask && pSrc->pDrawable)
{ {
if (op == PictOpSrc) if (op == PictOpSrc)
@ -489,7 +497,7 @@ exaComposite(CARD8 op,
ret = exaTryDriverSolidFill(pSrc, pDst, xSrc, ySrc, xDst, yDst, ret = exaTryDriverSolidFill(pSrc, pDst, xSrc, ySrc, xDst, yDst,
width, height); width, height);
if (ret == 1) if (ret == 1)
return; goto bail;
} }
else if (!pSrc->repeat && !pSrc->transform && else if (!pSrc->repeat && !pSrc->transform &&
pSrc->format == pDst->format) pSrc->format == pDst->format)
@ -504,7 +512,7 @@ exaComposite(CARD8 op,
if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst, if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst,
xSrc, ySrc, xMask, yMask, xDst, xSrc, ySrc, xMask, yMask, xDst,
yDst, width, height)) yDst, width, height))
return; goto bail;
exaCopyNtoN (pSrc->pDrawable, pDst->pDrawable, NULL, exaCopyNtoN (pSrc->pDrawable, pDst->pDrawable, NULL,
@ -512,11 +520,18 @@ exaComposite(CARD8 op,
xSrc - xDst, ySrc - yDst, xSrc - xDst, ySrc - yDst,
FALSE, FALSE, 0, NULL); FALSE, FALSE, 0, NULL);
REGION_UNINIT(pDst->pDrawable->pScreen, &region); REGION_UNINIT(pDst->pDrawable->pScreen, &region);
return; goto bail;
} }
} }
} }
/* Remove repeat in mask if useless */
if (pMask && pMask->repeat && !pMask->transform && xMask >= 0 &&
(xMask + width) <= pMask->pDrawable->width && yMask >= 0 &&
(yMask + height) <= pMask->pDrawable->height)
pMask->repeat = 0;
if (pSrc->pDrawable && (!pMask || pMask->pDrawable) && if (pSrc->pDrawable && (!pMask || pMask->pDrawable) &&
pExaScr->info->accel.PrepareComposite && pExaScr->info->accel.PrepareComposite &&
!pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap) !pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap)
@ -524,7 +539,7 @@ exaComposite(CARD8 op,
ret = exaTryDriverComposite(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, ret = exaTryDriverComposite(op, pSrc, pMask, pDst, xSrc, ySrc, xMask,
yMask, xDst, yDst, width, height); yMask, xDst, yDst, width, height);
if (ret == 1) if (ret == 1)
return; goto bail;
} }
if (ret != 0) { if (ret != 0) {
@ -543,6 +558,11 @@ exaComposite(CARD8 op,
ExaCheckComposite (op, pSrc, pMask, pDst, xSrc, ySrc, ExaCheckComposite (op, pSrc, pMask, pDst, xSrc, ySrc,
xMask, yMask, xDst, yDst, width, height); xMask, yMask, xDst, yDst, width, height);
bail:
pSrc->repeat = saveSrcRepeat;
if (pMask)
pMask->repeat = saveMaskRepeat;
} }
#endif #endif