summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86Extensions.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-07-10 02:03:18 +0100
committerKeith Packard <keithp@keithp.com>2012-07-10 00:31:01 -0700
commit9a953e0e9dcb8a8e43cc27ffaef460268fbe1916 (patch)
tree25b7a4f67b67b3740a9646df569fe7dc100a62a5 /hw/xfree86/common/xf86Extensions.c
parentb8a3267c36e2e335b888bd4f2ef2f2c477cdfdce (diff)
Move DRI2 from external module to built-in
Instead of keeping a tiny amount of code in an external module, just man up and build it into the core server. v2: Fix test/Makefile.am to only link libdri2.la if DRI2 is set Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw/xfree86/common/xf86Extensions.c')
-rw-r--r--hw/xfree86/common/xf86Extensions.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Extensions.c b/hw/xfree86/common/xf86Extensions.c
index b38ecf27c..15bab42ad 100644
--- a/hw/xfree86/common/xf86Extensions.c
+++ b/hw/xfree86/common/xf86Extensions.c
@@ -81,6 +81,15 @@ static ExtensionModule extensionModules[] = {
NULL
},
#endif
+#ifdef DRI2
+ {
+ DRI2ExtensionInit,
+ DRI2_NAME,
+ &noDRI2Extension,
+ NULL,
+ NULL
+ }
+#endif
};
static void