summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2013-11-08 09:20:29 -0500
committerAdam Jackson <ajax@redhat.com>2013-12-09 13:20:36 -0500
commit793fd5eefb0e417614d77fe1522c6548587fbd4e (patch)
tree11c6bbf3f355ee05df5260f339996f5a6e827f83
parent2bf92108294805c5c6fef249c2f7de6ecf4975d8 (diff)
dri2: Disable when Xinerama is active
Would only work on ScreenRec 0, which means it's broken. Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--hw/xfree86/dri2/dri2ext.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index e1decec9e..ffd66fad6 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -672,6 +672,11 @@ DRI2ExtensionInit(void)
{
ExtensionEntry *dri2Extension;
+#ifdef PANORAMIX
+ if (!noPanoramiXExtension)
+ return;
+#endif
+
dri2Extension = AddExtension(DRI2_NAME,
DRI2NumberEvents,
DRI2NumberErrors,