diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-09-03 14:55:05 +0200 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-12-08 10:13:17 -0500 |
| commit | 45edca0e9d7b833b9de3037e94f293122c922e42 (patch) | |
| tree | 795b74eeed4df902783c13feefbff38e84d4fbd7 | |
| parent | 3d59746808bc5f335104d27a8dce0fe94ab3cb78 (diff) | |
EXA: Check for solid/gradient pictures the same way for all generations.
In particular, also catch them for >= R300.
| -rw-r--r-- | src/r600_exa.c | 3 | ||||
| -rw-r--r-- | src/radeon_exa_render.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/r600_exa.c b/src/r600_exa.c index 9aeb8626..54d91e85 100644 --- a/src/r600_exa.c +++ b/src/r600_exa.c @@ -1313,6 +1313,9 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP if (op >= (int) (sizeof(R600BlendOp) / sizeof(R600BlendOp[0]))) RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); + if (!pSrcPicture->pDrawable) + RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); + pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); max_tex_w = 8192; diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c index 660ec433..e663b544 100644 --- a/src/radeon_exa_render.c +++ b/src/radeon_exa_render.c @@ -478,7 +478,7 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture, RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); if (!pSrcPicture->pDrawable) - return FALSE; + RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); /* r100 limit should be 2048, there are issues with 2048 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed @@ -813,7 +813,7 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); if (!pSrcPicture->pDrawable) - return FALSE; + RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); /* r200 limit should be 2048, there are issues with 2048 * see bug 19269 @@ -1192,6 +1192,9 @@ 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 (!pSrcPicture->pDrawable) + RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); + pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); if (IS_R500_3D) { |