diff options
| author | Alex Deucher <alex@samba.(none)> | 2008-03-13 18:32:00 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2008-03-13 18:32:00 -0400 |
| commit | 2bf0236c03538ace3ce6d0e68f0829fc47d1385b (patch) | |
| tree | f5fe74024e2dd67fa5ac62c1f29b5134040587b7 | |
| parent | 74286ba41302107d2fc626fee2181f7c4bc18164 (diff) | |
R3xx: enable composite for non-mask cases
| -rw-r--r-- | src/radeon_exa_render.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c index 9bdb4036..6cbe0bb3 100644 --- a/src/radeon_exa_render.c +++ b/src/radeon_exa_render.c @@ -946,7 +946,7 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); -#if 1 +#if 0 /* Throw out cases that aren't going to be our rotation first */ if (pMaskPicture != NULL || op != PictOpSrc || pSrcPicture->pDrawable == NULL) RADEON_FALLBACK(("Junk driver\n")); @@ -1047,9 +1047,12 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, TRACE; - if (pMask && pMaskPicture->componentAlpha) + //if (pMask && pMaskPicture->componentAlpha) + if (pMask) return FALSE; + ErrorF("op: 0x%x, src: 0x%x, dst: 0x%x\n", op, pSrcPicture->format, pDstPicture->format); + if (!info->XInited3D) RADEONInit3DEngine(pScrn); |