diff options
Diffstat (limited to 'fb/fbcompose.c')
| -rw-r--r-- | fb/fbcompose.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/fb/fbcompose.c b/fb/fbcompose.c index b7733dbb5..dd030d927 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.16 2002/11/06 22:45:35 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17 2003/11/03 05:11:00 tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -2826,9 +2826,6 @@ fbCompositeGeneral (CARD8 op, CARD16 height) { FbCompositeOperand src[4],msk[4],dst[4],*pmsk; - FbCompositeOperand *srcPict, *srcAlpha; - FbCompositeOperand *dstPict, *dstAlpha; - FbCompositeOperand *mskPict = 0, *mskAlpha = 0; FbCombineFunc f; int w; @@ -2836,26 +2833,6 @@ fbCompositeGeneral (CARD8 op, return; if (!fbBuildCompositeOperand (pDst, dst, xDst, yDst, FALSE, TRUE)) return; - if (pSrc->alphaMap) - { - srcPict = &src[1]; - srcAlpha = &src[2]; - } - else - { - srcPict = &src[0]; - srcAlpha = 0; - } - if (pDst->alphaMap) - { - dstPict = &dst[1]; - dstAlpha = &dst[2]; - } - else - { - dstPict = &dst[0]; - dstAlpha = 0; - } f = fbCombineFuncU[op]; if (pMask) { @@ -2864,16 +2841,6 @@ fbCompositeGeneral (CARD8 op, pmsk = msk; if (pMask->componentAlpha) f = fbCombineFuncC[op]; - if (pMask->alphaMap) - { - mskPict = &msk[1]; - mskAlpha = &msk[2]; - } - else - { - mskPict = &msk[0]; - mskAlpha = 0; - } } else pmsk = 0; |