[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20090707.git98c012f7-57-g9918e08

[Thomas White]

The following commit has been merged in the master branch:
commit 8b375051cb3b355be64f1818ec964c6230645bd7
Author: Thomas White <taw at bitwiz.org.uk>
Date:   Tue Aug 25 17:48:40 2009 +0100

    Restore composite hooks

diff --git a/src/glamo-kms-exa.c b/src/glamo-kms-exa.c
index 594962c..9ce5787 100644
--- a/src/glamo-kms-exa.c
+++ b/src/glamo-kms-exa.c
@@ -538,10 +538,49 @@ static Bool GlamoKMSExaModifyPixmapHeader(PixmapPtr pPix, int width, int height,
 
 	}
 
+	return TRUE;
+}
+
+
+Bool GlamoKMSExaCheckComposite(int op,
+                               PicturePtr pSrcPicture,
+                               PicturePtr pMaskPicture,
+                               PicturePtr pDstPicture)
+{
+	return FALSE;
+}
+
+
+Bool GlamoKMSExaPrepareComposite(int op,
+                                 PicturePtr pSrcPicture,
+                                 PicturePtr pMaskPicture,
+                                 PicturePtr pDstPicture,
+                                 PixmapPtr pSrc,
+                                 PixmapPtr pMask,
+                                 PixmapPtr pDst)
+{
 	return FALSE;
 }
 
 
+void GlamoKMSExaComposite(PixmapPtr pDst,
+                          int srcX,
+                          int srcY,
+                          int maskX,
+                          int maskY,
+                          int dstX,
+                          int dstY,
+                          int width,
+                          int height)
+{
+}
+
+
+void GlamoKMSExaDoneComposite(PixmapPtr pDst)
+{
+}
+
+
 void GlamoKMSExaClose(ScrnInfoPtr pScrn)
 {
 	exaDriverFini(pScrn->pScreen);
@@ -583,10 +622,10 @@ void GlamoKMSExaInit(ScrnInfoPtr pScrn)
 	exa->DoneCopy = GlamoKMSExaDoneCopy;
 
 	/* Composite (though these just cause fallback) */
-	exa->CheckComposite = NULL;//GlamoKMSExaCheckComposite;
-	exa->PrepareComposite = NULL;//GlamoKMSExaPrepareComposite;
-	exa->Composite = NULL;//GlamoKMSExaComposite;
-	exa->DoneComposite = NULL;//GlamoKMSExaDoneComposite;
+	exa->CheckComposite = GlamoKMSExaCheckComposite;
+	exa->PrepareComposite = GlamoKMSExaPrepareComposite;
+	exa->Composite = GlamoKMSExaComposite;
+	exa->DoneComposite = GlamoKMSExaDoneComposite;
 
 	exa->DownloadFromScreen = NULL;
 	exa->UploadToScreen = NULL;

-- 
xf86-video-glamo, SMedia Glamo video driver for X.Org