Only use copy optimization when source picture got a drawable

This commit is contained in:
David Reveman 2006-05-10 09:52:15 +00:00
parent 1f874947cd
commit 71d77861c2
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2006-05-10 David Reveman <davidr@novell.com>
* hw/xgl/xglcompose.c (xglCompositeGeneral): Only use copy optimization
when source picture got a drawable.
2006-05-09 David Reveman <davidr@novell.com>
* hw/xgl/xglxv.c (xglXvPutImage): Stride should be padded to a

View file

@ -175,9 +175,10 @@ xglCompositeGeneral (CARD8 op,
if (!pGeometry)
{
if (!pSrc->transform && pSrc->filter != PictFilterConvolution)
if (pSrc->pDrawable && !pSrc->transform &&
pSrc->filter != PictFilterConvolution)
{
if (pSrc->pDrawable && pSrc->repeatType == RepeatNormal)
if (pSrc->repeatType == RepeatNormal)
{
XGL_PIXMAP_PRIV ((PixmapPtr) pSrc->pDrawable);