diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-07-23 16:15:38 +0200 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-07-24 15:57:57 +0200 |
| commit | 7a0382130f0e7747753909f059fb1a664ecab529 (patch) | |
| tree | 61b2805142adf2075e6109ff58a6f575fbc15819 /configure.ac | |
| parent | e9112cd3f40166e1913fce2c68da41f3f11cf8ce (diff) | |
configure: drop check for --enable-vaapi-glx.
This flag is obsolete. It was meant to explicitly enable/disable VA/GLX API
support, or fallback to TFP+FBO if this API is not found. Now, we check for
the VA/GLX API by default if --enable-glx is set. If this API is not found,
we now default to use TFP+FBO.
Note: TFP+FBO, i.e. using vaPutSurface() is now also a deprecated usage and
will be removed in the future. If GLX rendering is requested, then the VA/GLX
API shall be used as it covers most usages. e.g. AMD driver can't render to
an X pixmap yet.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index f78919c6..7aca8b54 100644 --- a/configure.ac +++ b/configure.ac @@ -107,14 +107,9 @@ AC_ARG_ENABLE(x11, AC_ARG_ENABLE(glx, AS_HELP_STRING([--enable-glx], - [enable OpenGL/X11 @<:@default=yes@:>@]), + [enable OpenGL/X11 output @<:@default=yes@:>@]), [], [enable_glx="yes"]) -AC_ARG_ENABLE(vaapi-glx, - AS_HELP_STRING([--enable-vaapi-glx], - [enable VA/GLX extensions @<:@default=yes@:>@]), - [], [enable_vaapi_glx="yes"]) - AC_ARG_ENABLE(vaapisink-glx, AS_HELP_STRING([--enable-vaapisink-glx], [enable OpenGL/X11 to vaapisink @<:@default=yes@:>@]), @@ -358,10 +353,13 @@ HAVE_VA_GLX=0 LIBVA_GLX_PKGNAME="libva-glx" if test $USE_GLX -eq 1; then PKG_CHECK_MODULES(LIBVA_GLX, [$LIBVA_GLX_PKGNAME >= va_api_glx_version], - [HAVE_VA_GLX=1]) - if test "$enable_vaapi_glx" = "yes" -a $HAVE_VA_GLX -eq 0; then - AC_MSG_WARN([VA/GLX not found or disabled. Fallbacking to TFP+FBO]) - LIBVA_GLX_PKGNAME="$LIBVA_X11_PKGNAME" + [HAVE_VA_GLX=1], [LIBVA_GLX_PKGNAME="$LIBVA_X11_PKGNAME"]) + + if test $HAVE_VA_GLX -eq 1; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$LIBVA_GLX_CPPFLAGS" + AC_CHECK_HEADERS([va/va_glx.h], [:], [HAVE_VA_GLX=0]) + CPPFLAGS="$saved_CPPFLAGS" fi fi AC_SUBST(LIBVA_GLX_PKGNAME) @@ -420,10 +418,6 @@ AC_DEFINE_UNQUOTED(USE_GLX, $USE_GLX, [Defined to 1 if GLX is enabled]) AM_CONDITIONAL(USE_GLX, test $USE_GLX -eq 1) -AC_DEFINE_UNQUOTED([USE_VAAPI_GLX], [$HAVE_VA_GLX], - [Defined to 1 if VA/GLX is enabled]) -AM_CONDITIONAL([USE_VAAPI_GLX], [test $HAVE_VA_GLX -eq 1]) - AC_DEFINE_UNQUOTED(USE_VAAPISINK_GLX, $USE_VAAPISINK_GLX, [Defined to 1 to enable GLX support to vaapisink]) AM_CONDITIONAL(USE_VAAPISINK_GLX, test $USE_VAAPISINK_GLX -eq 1) |