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

Fix a couple of picture repeat fields incorrectly compared to RepeatNormal.

This commit is contained in:
Michel Dänzer 2007-04-29 23:38:13 +02:00
parent 78a2045535
commit 2866e0bac9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exa/exa_render.c
View File

@ -627,8 +627,8 @@ exaComposite(CARD8 op,
pMask->repeat = 0; pMask->repeat = 0;
if (pExaScr->info->PrepareComposite && if (pExaScr->info->PrepareComposite &&
(!pSrc->repeat || pSrc->repeat == RepeatNormal) && (!pSrc->repeat || pSrc->repeatType == RepeatNormal) &&
(!pMask || !pMask->repeat || pMask->repeat == RepeatNormal) && (!pMask || !pMask->repeat || pMask->repeatType == RepeatNormal) &&
!pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap) !pSrc->alphaMap && (!pMask || !pMask->alphaMap) && !pDst->alphaMap)
{ {
Bool isSrcSolid; Bool isSrcSolid;

2
fb/fbpict.c
View File

@ -1495,7 +1495,7 @@ fbComposite (CARD8 op,
{ {
xMask += pMask->pDrawable->x; xMask += pMask->pDrawable->x;
yMask += pMask->pDrawable->y; yMask += pMask->pDrawable->y;
maskRepeat = pMask->repeat == RepeatNormal; maskRepeat = pMask->repeatType == RepeatNormal;
if (pMask->filter == PictFilterConvolution) if (pMask->filter == PictFilterConvolution)
maskTransform = TRUE; maskTransform = TRUE;

2
hw/xgl/xglcompose.c
View File

@ -177,7 +177,7 @@ xglCompositeGeneral (CARD8 op,
{ {
if (!pSrc->transform && pSrc->filter != PictFilterConvolution) if (!pSrc->transform && pSrc->filter != PictFilterConvolution)
{ {
if (pSrc->pDrawable && pSrc->repeat == RepeatNormal) if (pSrc->pDrawable && pSrc->repeatType == RepeatNormal)
{ {
XGL_PIXMAP_PRIV ((PixmapPtr) pSrc->pDrawable); XGL_PIXMAP_PRIV ((PixmapPtr) pSrc->pDrawable);