Commit eb2cf117 authored by Michel Dänzer's avatar Michel Dänzer Committed by Peter Hutterer

Xephyr: Handle source-only pictures in ephyrPrepare/DoneComposite

There is no pixmap associated with source-only pictures.

Fixes Xephyr -fakexa crashing on startup.
Signed-off-by: Michel Dänzer's avatarMichel Dänzer <>
Reviewed-by: default avatarAlex Deucher <>
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <>
parent fdc79fe7
......@@ -254,7 +254,8 @@ ephyrPrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
EphyrFakexaPriv *fakexa = scrpriv->fakexa;
ephyrPreparePipelinedAccess(pDst, EXA_PREPARE_DEST);
ephyrPreparePipelinedAccess(pSrc, EXA_PREPARE_SRC);
if (pSrc != NULL)
ephyrPreparePipelinedAccess(pSrc, EXA_PREPARE_SRC);
if (pMask != NULL)
ephyrPreparePipelinedAccess(pMask, EXA_PREPARE_MASK);
......@@ -298,7 +299,8 @@ ephyrDoneComposite(PixmapPtr pDst)
if (fakexa->pMask != NULL)
ephyrFinishPipelinedAccess(fakexa->pMask, EXA_PREPARE_MASK);
ephyrFinishPipelinedAccess(fakexa->pSrc, EXA_PREPARE_SRC);
if (fakexa->pSrc != NULL)
ephyrFinishPipelinedAccess(fakexa->pSrc, EXA_PREPARE_SRC);
ephyrFinishPipelinedAccess(fakexa->pDst, EXA_PREPARE_DEST);
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment