summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2008-09-16 17:13:42 +0200
committerJulien Cristau <jcristau@debian.org>2008-09-16 17:13:42 +0200
commitb4762c0245ed2966606171cf27f40aa745fdc76e (patch)
treea9be678ed0dad0ad7d849c2d554b611e9cd3088a
parent52bbfc5bfa64fd09ef625f35a2fb4a0518003825 (diff)
exa: disable shared pixmaps
They got re-enabled in ee7c684f21d220d5e046bab31ae617a7d64d60f6 ("Reimplement ShmPutImage.")
-rw-r--r--exa/exa.c10
1 files changed, 10 insertions, 0 deletions
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
*/