summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2006-12-19 15:24:19 +0100
committerMichel Dänzer <michel@tungstengraphics.com>2006-12-19 15:24:19 +0100
commit6b1e354dbb6e8ed9f2c654bbe7f8bbf241843d1c (patch)
treec822dcd6248d5126ab4cafb483e9105f4663fc0a
parent1b029fd896b76096905c516925ce0214fe14632c (diff)
EXA: Disable SHM pixmaps.
See https://bugs.freedesktop.org/show_bug.cgi?id=6772 .
-rw-r--r--exa/exa.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/exa/exa.c b/exa/exa.c
index b49065303..bf9411469 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -32,6 +32,10 @@
#include <dix-config.h>
#endif
+#ifdef MITSHM
+#include "shmint.h"
+#endif
+
#include <stdlib.h>
#include "exa_priv.h"
@@ -610,6 +614,13 @@ exaDriverInit (ScreenPtr pScreen,
miDisableCompositeWrapper(pScreen);
#endif
+#ifdef MITSHM
+ /* Re-register with the MI funcs, which don't allow shared pixmaps.
+ * Shared pixmaps are almost always a performance loss for us, but this
+ * still allows for SHM PutImage.
+ */
+ ShmRegisterFuncs(pScreen, NULL);
+#endif
/*
* Hookup offscreen pixmaps
*/