summaryrefslogtreecommitdiff
path: root/hw/xgl
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-12-23 01:49:21 +0000
committerDave Airlie <airlied@linux.ie>2005-12-23 01:49:21 +0000
commitc88a3145d057ab72466a3ea8b789bf419e4efc33 (patch)
tree69accb58ccf88767fae08f55a840b93a1aabed9f /hw/xgl
parentc59508566f11982aa3f4be383597d0e6178718c2 (diff)
downloadxserver-c88a3145d057ab72466a3ea8b789bf419e4efc33.tar.gz
from davidr's tree if source picture defined return
Diffstat (limited to 'hw/xgl')
-rw-r--r--hw/xgl/xglcomp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/xgl/xglcomp.c b/hw/xgl/xglcomp.c
index 3d153f34c..a84efa4b6 100644
--- a/hw/xgl/xglcomp.c
+++ b/hw/xgl/xglcomp.c
@@ -78,6 +78,9 @@ xglComp (CARD8 op,
if (op >= NUM_XGL_OPERATORS)
return FALSE;
+ if (pSrc->pSourcePict)
+ return FALSE;
+
if (pSrc->pDrawable->type != DRAWABLE_PIXMAP)
return FALSE;
@@ -86,6 +89,8 @@ xglComp (CARD8 op,
if (pMask)
{
+ if (pMask->pSourcePict)
+ return FALSE;
if (pMask->pDrawable->type != DRAWABLE_PIXMAP)
return FALSE;