diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2013-02-16 20:48:45 +0000 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-06-12 10:42:56 +0200 |
| commit | 45dbcaac301efce04d0bb492337f4febf8129ed9 (patch) | |
| tree | 69fe72cf7056bdbba506e48beed1c5ba20edfc05 | |
| parent | ea8d225fe100ecabb72e3cc0a92372f16afb10b3 (diff) | |
nouveau: mandate dri2 build
Building nouveau without dri2 is just silly
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/nouveau_dri2.c | 16 |
2 files changed, 3 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index fa4a2dc..4f9f0b1 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,7 @@ AC_SUBST(LIBDRM_NOUVEAU_CFLAGS) AC_SUBST(LIBDRM_NOUVEAU_LIBS) PKG_CHECK_MODULES(XORG, [xorg-server >= 1.8] xproto fontsproto libdrm $REQUIRED_MODULES) +PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6]) PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), HAVE_XEXTPROTO_71="no") diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index 5511b36..3785956 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -7,9 +7,10 @@ #include "nv_include.h" #ifdef DRI2 #include "dri2.h" +#else +#error "This driver requires a DRI2-enabled X server" #endif -#if defined(DRI2) && DRI2INFOREC_VERSION >= 3 struct nouveau_dri2_buffer { DRI2BufferRec base; PixmapPtr ppix; @@ -817,16 +818,3 @@ nouveau_dri2_fini(ScreenPtr pScreen) { DRI2CloseScreen(pScreen); } -#else -Bool -nouveau_dri2_init(ScreenPtr pScreen) -{ - return TRUE; -} - -void -nouveau_dri2_fini(ScreenPtr pScreen) -{ -} -#endif - |