[Mesa-dev] [PATCH] Remove VAAPI support.
Christian König
deathsimple at vodafone.de
Sat Sep 8 02:57:01 PDT 2012
On 07.09.2012 20:34, Matt Turner wrote:
> Not working and unmaintained.
I still have it on my todo list to actually fix this one and bring it to
an usable state, but till then I think it is a good idea to remove the
current completely broken code.
Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
> Only included in this diff are changes to the files (actually, just
> configure.ac) that we're keeping.
>
> configure.ac | 42 +------
> src/gallium/state_trackers/va/Makefile | 26 ----
> src/gallium/state_trackers/va/ftab.c | 136 ---------------------
> src/gallium/state_trackers/va/htab.c | 95 ---------------
> src/gallium/state_trackers/va/va_buffer.c | 88 -------------
> src/gallium/state_trackers/va/va_config.c | 121 ------------------
> src/gallium/state_trackers/va/va_context.c | 105 ----------------
> src/gallium/state_trackers/va/va_display.c | 63 ----------
> src/gallium/state_trackers/va/va_image.c | 151 -----------------------
> src/gallium/state_trackers/va/va_picture.c | 60 ---------
> src/gallium/state_trackers/va/va_private.h | 162 -------------------------
> src/gallium/state_trackers/va/va_subpicture.c | 143 ----------------------
> src/gallium/state_trackers/va/va_surface.c | 142 ----------------------
> src/gallium/targets/Makefile.va | 73 -----------
> src/gallium/targets/va-r300/Makefile | 26 ----
> src/gallium/targets/va-r300/target.c | 24 ----
> src/gallium/targets/va-r600/Makefile | 26 ----
> src/gallium/targets/va-r600/target.c | 24 ----
> src/gallium/targets/va-softpipe/Makefile | 21 ---
> 19 files changed, 4 insertions(+), 1524 deletions(-)
> delete mode 100644 src/gallium/state_trackers/va/Makefile
> delete mode 100644 src/gallium/state_trackers/va/ftab.c
> delete mode 100644 src/gallium/state_trackers/va/htab.c
> delete mode 100644 src/gallium/state_trackers/va/va_buffer.c
> delete mode 100644 src/gallium/state_trackers/va/va_config.c
> delete mode 100644 src/gallium/state_trackers/va/va_context.c
> delete mode 100644 src/gallium/state_trackers/va/va_display.c
> delete mode 100644 src/gallium/state_trackers/va/va_image.c
> delete mode 100644 src/gallium/state_trackers/va/va_picture.c
> delete mode 100644 src/gallium/state_trackers/va/va_private.h
> delete mode 100644 src/gallium/state_trackers/va/va_subpicture.c
> delete mode 100644 src/gallium/state_trackers/va/va_surface.c
> delete mode 100644 src/gallium/targets/Makefile.va
> delete mode 100644 src/gallium/targets/va-r300/Makefile
> delete mode 100644 src/gallium/targets/va-r300/target.c
> delete mode 100644 src/gallium/targets/va-r600/Makefile
> delete mode 100644 src/gallium/targets/va-r600/target.c
> delete mode 100644 src/gallium/targets/va-softpipe/Makefile
>
> diff --git a/configure.ac b/configure.ac
> index 8b061b9..440fee3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -579,11 +579,6 @@ AC_ARG_ENABLE([vdpau],
> [enable vdpau library @<:@default=auto@:>@])],
> [enable_vdpau="$enableval"],
> [enable_vdpau=auto])
> -AC_ARG_ENABLE([va],
> - [AS_HELP_STRING([--enable-va],
> - [enable va library @<:@default=auto@:>@])],
> - [enable_va="$enableval"],
> - [enable_va=auto])
> AC_ARG_ENABLE([opencl],
> [AS_HELP_STRING([--enable-opencl],
> [enable OpenCL library @<:@default=no@:>@])],
> @@ -647,7 +642,6 @@ if test "x$enable_opengl" = xno -a \
> "x$enable_xa" = xno -a \
> "x$enable_xvmc" = xno -a \
> "x$enable_vdpau" = xno -a \
> - "x$enable_va" = xno -a \
> "x$enable_opencl" = xno; then
> AC_MSG_ERROR([at least one API should be enabled])
> fi
> @@ -1374,12 +1368,6 @@ if test "x$enable_gallium_g3dvl" = xyes; then
> if test "x$enable_vdpau" = xauto; then
> PKG_CHECK_EXISTS([vdpau], [enable_vdpau=yes], [enable_vdpau=no])
> fi
> -
> - if test "x$enable_va" = xauto; then
> - #don't enable vaapi state tracker even if package exists
> - #PKG_CHECK_EXISTS([libva], [enable_vdpau=yes], [enable_vdpau=no])
> - enable_va=no
> - fi
> fi
>
> if test "x$enable_xvmc" = xyes; then
> @@ -1394,13 +1382,6 @@ if test "x$enable_vdpau" = xyes; then
> HAVE_ST_VDPAU="yes"
> fi
>
> -if test "x$enable_va" = xyes; then
> - PKG_CHECK_MODULES([LIBVA], [libva = 0.31.1 x11-xcb xcb-dri2 >= 1.8])
> - AC_MSG_WARN([vaapi state tracker currently unmaintained])
> - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS va"
> - HAVE_ST_VA="yes"
> -fi
> -
> dnl
> dnl OpenCL configuration
> dnl
> @@ -1682,14 +1663,6 @@ AC_ARG_WITH([vdpau-libdir],
> [VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau'])
> AC_SUBST([VDPAU_LIB_INSTALL_DIR])
>
> -dnl Directory for VA libs
> -AC_ARG_WITH([va-libdir],
> - [AS_HELP_STRING([--with-va-libdir=DIR],
> - [directory for the VA libraries @<:@default=${libdir}/va@:>@])],
> - [VA_LIB_INSTALL_DIR="$withval"],
> - [VA_LIB_INSTALL_DIR='${libdir}/va'])
> -AC_SUBST([VA_LIB_INSTALL_DIR])
> -
> dnl Directory for OpenCL libs
> AC_ARG_WITH([opencl-libdir],
> [AS_HELP_STRING([--with-opencl-libdir=DIR],
> @@ -1704,7 +1677,7 @@ dnl
> gallium_check_st() {
> if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes ||
> test "x$HAVE_ST_XA" = xyes || test "x$HAVE_ST_XVMC" = xyes ||
> - test "x$HAVE_ST_VDPAU" = xyes || test "x$HAVE_ST_VA" = xyes; then
> + test "x$HAVE_ST_VDPAU" = xyes; then
> if test "x$have_libdrm" != xyes; then
> AC_MSG_ERROR([DRI or Xorg DDX requires libdrm >= $LIBDRM_REQUIRED])
> fi
> @@ -1725,9 +1698,6 @@ gallium_check_st() {
> if test "x$HAVE_ST_VDPAU" = xyes && test "x$6" != x; then
> GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $6"
> fi
> - if test "x$HAVE_ST_VA" = xyes && test "x$7" != x; then
> - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $7"
> - fi
> }
>
> gallium_require_llvm() {
> @@ -1772,7 +1742,7 @@ if test "x$with_gallium_drivers" != x; then
> PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
> gallium_require_llvm "Gallium R300"
> GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
> - gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" "" "xvmc-r300" "vdpau-r300" "va-r300"
> + gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" "" "xvmc-r300" "vdpau-r300"
> ;;
> xr600)
> PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
> @@ -1790,7 +1760,7 @@ if test "x$with_gallium_drivers" != x; then
> if test "x$enable_opencl" = xyes -a "x$with_llvm_shared_libs" = xno; then
> LLVM_LIBS="${LLVM_LIBS} `$LLVM_CONFIG --libs bitreader asmparser`"
> fi
> - gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" "va-r600"
> + gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600"
> ;;
> xradeonsi)
> PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
> @@ -1823,12 +1793,8 @@ if test "x$with_gallium_drivers" != x; then
> if test "x$HAVE_ST_XVMC" = xyes; then
> GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS xvmc-softpipe"
> fi
> - if test "x$HAVE_ST_VA" = xyes; then
> - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS va-softpipe"
> - fi
> if test "x$HAVE_ST_VDPAU" = xyes ||
> - test "x$HAVE_ST_XVMC" = xyes ||
> - test "x$HAVE_ST_VA" = xyes; then
> + test "x$HAVE_ST_XVMC" = xyes; then
> if test "x$HAVE_WINSYS_XLIB" != xyes; then
> GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"
> fi
More information about the mesa-dev
mailing list