xserver/hw/kdrive/src kaapict.c,1.8,1.9 kdrive.h,1.51,1.52

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory pdx:/home/anholt/xserver/hw/kdrive/src

Modified Files:
	kaapict.c kdrive.h 
Log Message:
Add new CheckComposite hook.  This allows a driver to avoid
the migration of pixmaps for a Composite operation if the
operation can't be supported.  This hook is optional.


Index: kaapict.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaapict.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/kaapict.c	9 Jan 2004 08:40:32 -0000	1.8
+++ b/kaapict.c	17 May 2004 07:14:23 -0000	1.9
@@ -426,6 +426,11 @@
 				   width, height))
 	return 1;
 
+    if (pKaaScr->info->CheckComposite &&
+	!(*pKaaScr->info->CheckComposite) (op, pSrc, pMask, pDst))
+    {
+	return -1;
+    }
 
     if (pSrc->pDrawable->type == DRAWABLE_PIXMAP)
 	kaaPixmapUseScreen ((PixmapPtr) pSrc->pDrawable);

Index: kdrive.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kdrive.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- a/kdrive.h	14 May 2004 00:34:28 -0000	1.51
+++ b/kdrive.h	17 May 2004 07:14:23 -0000	1.52
@@ -348,6 +348,10 @@
 			  int	height);
     void	(*DoneBlend) (void);
 
+    Bool        (*CheckComposite) (int		op,
+				   PicturePtr	pSrcPicture,
+				   PicturePtr	pMaskPicture,
+				   PicturePtr	pDstPicture);
     Bool        (*PrepareComposite) (int		op,
 				     PicturePtr		pSrcPicture,
 				     PicturePtr		pMaskPicture,