summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2009-08-25 17:48:40 +0100
committerThomas White <taw@bitwiz.org.uk>2009-08-25 17:48:40 +0100
commit8b375051cb3b355be64f1818ec964c6230645bd7 (patch)
treea50720e852c87a7939a06839858a62e08b36cb67
parenta1f4b5a29a2dcecab97117258c7510baf6c6bf8a (diff)
Restore composite hooks
-rw-r--r--src/glamo-kms-exa.c47
1 files changed, 43 insertions, 4 deletions
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;