diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-07-16 03:44:40 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-07-16 03:44:40 +0100 |
| commit | 23a14278543eaa1cd37709eb8ccad2ab2babc81b (patch) | |
| tree | 6f791ab9879b8772faac52800f6f06998105ec1c | |
| parent | effa2938ee2b576b8eb6cd7f774d8b1656c50e82 (diff) | |
rendition: port to non-XAA server
even though rendition never actually had working XAA support, ah well.
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | src/rendition.h | 2 | ||||
| -rw-r--r-- | src/vtypes.h | 2 |
3 files changed, 22 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index f74b912..eecfd16 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,24 @@ AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[]) AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[]) CPPFLAGS="$SAVE_CPPFLAGS" +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA="$enableval"], + [XAA=auto]) +if test "x$XAA" != xno; then + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$XORG_CFLAGS + CPPFLAGS="$XORG_CFLAGS" + AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS +fi +AC_MSG_CHECKING([whether to include XAA support]) +AM_CONDITIONAL(XAA, test "x$XAA" = xyes) +AC_MSG_RESULT([$XAA]) + if test "x$XSERVER_LIBPCIACCESS" = xyes; then PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" diff --git a/src/rendition.h b/src/rendition.h index 7d104a8..f7f13d4 100644 --- a/src/rendition.h +++ b/src/rendition.h @@ -53,8 +53,10 @@ #include "fb.h" /* Drivers using the XAA interface ... */ +#ifdef HAVE_XAA_H #include "xaa.h" #include "xaalocal.h" +#endif #include "xf86fbman.h" /* HW-cursor definitions */ diff --git a/src/vtypes.h b/src/vtypes.h index 5e0abf1..b221aa3 100644 --- a/src/vtypes.h +++ b/src/vtypes.h @@ -185,7 +185,9 @@ typedef struct _renditionRec EntityInfoPtr pEnt; /* entity information */ CloseScreenProcPtr CloseScreen; /* wrap CloseScreen */ xf86CursorInfoPtr CursorInfoRec; /* Cursor data */ +#ifdef HAVE_XAA_H XAAInfoRecPtr AccelInfoRec; /* Needed for XAA */ +#endif OptionInfoPtr Options; RenditionRegRec saveRegs; } renditionRec, *renditionPtr; |