From b4762c0245ed2966606171cf27f40aa745fdc76e Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 16 Sep 2008 17:13:42 +0200 Subject: [PATCH] exa: disable shared pixmaps They got re-enabled in ee7c684f21d220d5e046bab31ae617a7d64d60f6 ("Reimplement ShmPutImage.") --- exa/exa.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/exa/exa.c b/exa/exa.c index 1d0d23f6b..6e769a7bf 100644 --- a/exa/exa.c +++ b/exa/exa.c @@ -42,6 +42,10 @@ DevPrivateKey exaScreenPrivateKey = &exaScreenPrivateKeyIndex; static int exaPixmapPrivateKeyIndex; DevPrivateKey exaPixmapPrivateKey = &exaPixmapPrivateKeyIndex; +#ifdef MITSHM +static ShmFuncs exaShmFuncs = { NULL, NULL }; +#endif + static _X_INLINE void* ExaGetPixmapAddress(PixmapPtr p) { @@ -924,6 +928,12 @@ exaDriverInit (ScreenPtr pScreen, } #endif +#ifdef MITSHM + /* + * Don't allow shared pixmaps. + */ + ShmRegisterFuncs(pScreen, &exaShmFuncs); +#endif /* * Hookup offscreen pixmaps */