summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2008-09-16 17:13:42 +0200
committerAdam Jackson <ajax@redhat.com>2008-09-23 10:36:02 -0400
commitce6424853c2df2486ad99c0369974afc91a92993 (patch)
tree56f1767ed49c896f1a792306e302d90358b491ae
parent37876602957924c7cff759a800eddd574ee2385a (diff)
exa: disable shared pixmaps
They got re-enabled in ee7c684f21d220d5e046bab31ae617a7d64d60f6 ("Reimplement ShmPutImage.") (cherry picked from commit b4762c0245ed2966606171cf27f40aa745fdc76e)
-rw-r--r--exa/exa.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/exa/exa.c b/exa/exa.c
index ccf148a3e..72539c0f3 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -43,6 +43,10 @@
DevPrivateKey exaScreenPrivateKey = &exaScreenPrivateKey;
DevPrivateKey exaPixmapPrivateKey = &exaPixmapPrivateKey;
+#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
*/