xserver/hw/xgl xglcomp.c,1.5,1.6
Dave Airlie
xserver-commit at pdx.freedesktop.org
Thu Dec 22 17:49:23 PST 2005
Committed by: airlied
Update of /cvs/xserver/xserver/hw/xgl
In directory gabe:/tmp/cvs-serv16099
Modified Files:
xglcomp.c
Log Message:
from davidr's tree if source picture defined return
Index: xglcomp.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglcomp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xglcomp.c 1 Mar 2005 16:34:31 -0000 1.5
+++ xglcomp.c 23 Dec 2005 01:49:21 -0000 1.6
@@ -78,6 +78,9 @@
if (op >= NUM_XGL_OPERATORS)
return FALSE;
+ if (pSrc->pSourcePict)
+ return FALSE;
+
if (pSrc->pDrawable->type != DRAWABLE_PIXMAP)
return FALSE;
@@ -86,6 +89,8 @@
if (pMask)
{
+ if (pMask->pSourcePict)
+ return FALSE;
if (pMask->pDrawable->type != DRAWABLE_PIXMAP)
return FALSE;
More information about the xserver-commit
mailing list