configure.ac | 17 ++++++++++++++++- src/Makefile.am | 6 ++++++ 2 files changed, 22 insertions(+), 1 deletion(-)
New commits: commit deaf51323ac37922aa4300db3932f054cd1fea40 Author: James Simmons <[email protected]> Date: Sun May 26 19:05:09 2013 -0400 Test for dri2 and glamor. If available link against them diff --git a/configure.ac b/configure.ac index b13cb2c..e53ce38 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,7 @@ AM_CONDITIONAL(DRI, test x$DRI = xyes) if test "$DRI" = yes; then AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) - AC_CHECK_HEADER([damage.h], + AC_CHECK_HEADER([damage.h], [have_damage_h="yes"], [have_damage_h="no"],[-]) if test "$have_damage_h" = yes; then AC_DEFINE(DAMAGE,1,[Use Damage extension]) @@ -120,6 +120,21 @@ if test "$DRI" = yes; then if test "x$LIBUDEV" = xyes; then AC_DEFINE(HAVE_LIBUDEV, 1,[libudev support]) fi + PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6],, DRI2=no) + + AC_MSG_CHECKING([whether to include GLAMOR support]) + AC_ARG_ENABLE(glamor, + AS_HELP_STRING([--enable-glamor], + [Enable glamor, a new GL-based acceleration [default=no]]), + [GLAMOR="$enableval"], + [GLAMOR=no]) + AC_MSG_RESULT([$GLAMOR]) + AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno) + if test "x$GLAMOR" != "xno"; then + PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.3.1]) + PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl]) + AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration]) + fi case "$host_cpu" in i*86) diff --git a/src/Makefile.am b/src/Makefile.am index 7f67bed..7c52cc3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -85,6 +85,12 @@ openchrome_drv_la_SOURCES += \ via_xvmc.c \ via_xvmc.h \ drm_fourcc.h + +if GLAMOR +AM_CFLAGS += @LIBGLAMOR_CFLAGS@ +openchrome_drv_la_LDFLAGS += @LIBGLAMOR_LIBS@ +endif + else EXTRA_DIST += \ via_dri.c \ _______________________________________________ Openchrome-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/openchrome-devel
