Am Mittwoch, den 06.11.2013, 21:52 -0800 schrieb Matt Turner:
> ---
> Deleted files diff removed.
>
I think there was some nice stuff in here that didn't make it into XA,
but that's no valid reason to keep st/xorg alive in the tree.
If someone is interested in porting things to XA, it's just some git
history digging.
So,
Acked-by: Lucas Stach <l.st...@pengutronix.de>
> configure.ac | 56 +-
> src/gallium/SConscript | 3 -
> src/gallium/state_trackers/Makefile.am | 4 -
> src/gallium/state_trackers/xorg/Makefile.am | 43 -
> src/gallium/state_trackers/xorg/Makefile.sources | 11 -
> src/gallium/state_trackers/xorg/SConscript | 29 -
> src/gallium/state_trackers/xorg/compat-api.h | 99 --
> src/gallium/state_trackers/xorg/xorg_composite.c | 585 ----------
> src/gallium/state_trackers/xorg/xorg_composite.h | 36 -
> src/gallium/state_trackers/xorg/xorg_crtc.c | 448 --------
> src/gallium/state_trackers/xorg/xorg_dri2.c | 473 --------
> src/gallium/state_trackers/xorg/xorg_driver.c | 1323
> ----------------------
> src/gallium/state_trackers/xorg/xorg_exa.c | 1087 ------------------
> src/gallium/state_trackers/xorg/xorg_exa.h | 76 --
> src/gallium/state_trackers/xorg/xorg_exa_tgsi.c | 690 -----------
> src/gallium/state_trackers/xorg/xorg_exa_tgsi.h | 59 -
> src/gallium/state_trackers/xorg/xorg_output.c | 331 ------
> src/gallium/state_trackers/xorg/xorg_renderer.c | 547 ---------
> src/gallium/state_trackers/xorg/xorg_renderer.h | 81 --
> src/gallium/state_trackers/xorg/xorg_tracker.h | 236 ----
> src/gallium/state_trackers/xorg/xorg_winsys.h | 50 -
> src/gallium/state_trackers/xorg/xorg_xv.c | 750 ------------
> src/gallium/state_trackers/xorg/xorg_xvmc.c | 119 --
> 23 files changed, 11 insertions(+), 7125 deletions(-)
> delete mode 100644 src/gallium/state_trackers/xorg/Makefile.am
> delete mode 100644 src/gallium/state_trackers/xorg/Makefile.sources
> delete mode 100644 src/gallium/state_trackers/xorg/SConscript
> delete mode 100644 src/gallium/state_trackers/xorg/compat-api.h
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_composite.c
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_composite.h
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_crtc.c
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_dri2.c
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_driver.c
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_exa.c
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_exa.h
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_exa_tgsi.h
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_output.c
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_renderer.c
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_renderer.h
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_tracker.h
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_winsys.h
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_xv.c
> delete mode 100644 src/gallium/state_trackers/xorg/xorg_xvmc.c
>
> diff --git a/configure.ac b/configure.ac
> index 6caa125..28faf24 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -35,8 +35,6 @@ LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41"
> LIBDRM_FREEDRENO_REQUIRED=2.4.39
> DRI2PROTO_REQUIRED=2.6
> GLPROTO_REQUIRED=1.4.14
> -LIBDRM_XORG_REQUIRED=2.4.24
> -LIBKMS_XORG_REQUIRED=1.0.0
>
> dnl Check for progs
> AC_PROG_CPP
> @@ -556,11 +554,6 @@ AC_ARG_ENABLE([egl],
> [enable_egl="$enableval"],
> [enable_egl=yes])
>
> -AC_ARG_ENABLE([xorg],
> - [AS_HELP_STRING([--enable-xorg],
> - [enable support for X.Org DDX API @<:@default=no@:>@])],
> - [enable_xorg="$enableval"],
> - [enable_xorg=no])
> AC_ARG_ENABLE([xa],
> [AS_HELP_STRING([--enable-xa],
> [enable build of the XA X Acceleration API @<:@default=no@:>@])],
> @@ -651,7 +644,6 @@ if test "x$enable_opengl" = xno -a \
> "x$enable_gles1" = xno -a \
> "x$enable_gles2" = xno -a \
> "x$enable_openvg" = xno -a \
> - "x$enable_xorg" = xno -a \
> "x$enable_xa" = xno -a \
> "x$enable_xvmc" = xno -a \
> "x$enable_vdpau" = xno -a \
> @@ -1236,20 +1228,6 @@ fi
> AM_CONDITIONAL(HAVE_GALLIUM_GBM, test "x$enable_gallium_gbm" = xyes)
>
> dnl
> -dnl X.Org DDX configuration
> -dnl
> -if test "x$enable_xorg" = xyes; then
> - PKG_CHECK_MODULES([XORG], [xorg-server >= 1.6.0])
> - PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED])
> - PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])
> - PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
> - HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",
> - HAVE_XEXTPROTO_71="no")
> - GALLIUM_STATE_TRACKERS_DIRS="xorg $GALLIUM_STATE_TRACKERS_DIRS"
> -fi
> -AM_CONDITIONAL(HAVE_ST_XORG, test "x$enable_xorg" = xyes)
> -
> -dnl
> dnl XA configuration
> dnl
> if test "x$enable_xa" = xyes; then
> @@ -1487,13 +1465,6 @@ AC_ARG_WITH([egl-driver-dir],
> [EGL_DRIVER_INSTALL_DIR='${libdir}/egl'])
> AC_SUBST([EGL_DRIVER_INSTALL_DIR])
>
> -AC_ARG_WITH([xorg-driver-dir],
> - [AS_HELP_STRING([--with-xorg-driver-dir=DIR],
> - [Default xorg driver
> directory[[default=${libdir}/xorg/modules/drivers]]])],
> - [XORG_DRIVER_INSTALL_DIR="$withval"],
> - [XORG_DRIVER_INSTALL_DIR="${libdir}/xorg/modules/drivers"])
> -AC_SUBST([XORG_DRIVER_INSTALL_DIR])
> -
> AC_ARG_WITH([max-width],
> [AS_HELP_STRING([--with-max-width=N],
> [Maximum framebuffer width (4096)])],
> @@ -1675,18 +1646,15 @@ gallium_check_st() {
> if test "x$enable_dri" = xyes && test "x$2" != x; then
> GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2"
> fi
> - if test "x$enable_xorg" = xyes && test "x$3" != x; then
> + if test "x$enable_xa" = xyes && test "x$3" != x; then
> GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3"
> fi
> - if test "x$enable_xa" = xyes && test "x$4" != x; then
> + if test "x$enable_xvmc" = xyes && test "x$4" != x; then
> GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $4"
> fi
> - if test "x$enable_xvmc" = xyes && test "x$5" != x; then
> + if test "x$enable_vdpau" = xyes && test "x$5" != x; then
> GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $5"
> fi
> - if test "x$enable_vdpau" = xyes && test "x$6" != x; then
> - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $6"
> - fi
> }
>
> gallium_require_llvm() {
> @@ -1726,9 +1694,8 @@ radeon_llvm_check() {
> }
>
> dnl Gallium drivers
> -if test "x$enable_dri" = xyes -o "x$enable_xorg" = xyes -o \
> - "x$enable_xa" = xyes -o "x$enable_xvmc" = xyes -o \
> - "x$enable_vdpau" = xyes; then
> +if test "x$enable_dri" = xyes -o "x$enable_xa" = xyes -o \
> + "x$enable_xvmc" = xyes -o "x$enable_vdpau" = xyes; then
> NEED_NONNULL_WINSYS=yes
> fi
> AM_CONDITIONAL(NEED_NONNULL_WINSYS, test "x$NEED_NONNULL_WINSYS" = xyes)
> @@ -1741,7 +1708,7 @@ if test "x$with_gallium_drivers" != x; then
> xsvga)
> HAVE_GALLIUM_SVGA=yes
> GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga softpipe"
> - gallium_check_st "svga/drm" "dri-vmwgfx" "" "xa-vmwgfx"
> + gallium_check_st "svga/drm" "dri-vmwgfx" "xa-vmwgfx"
> ;;
> xi915)
> HAVE_GALLIUM_I915=yes
> @@ -1767,7 +1734,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" "r300/dri" "" "" "" ""
> + gallium_check_st "radeon/drm" "r300/dri" "" "" ""
> DRICOMMON_NEED_LIBDRM=yes
> ;;
> xr600)
> @@ -1785,7 +1752,7 @@ if test "x$with_gallium_drivers" != x; then
> if test "x$enable_opencl" = xyes; then
> LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser"
> fi
> - gallium_check_st "radeon/drm" "r600/dri" "" "" "r600/xvmc"
> "r600/vdpau"
> + gallium_check_st "radeon/drm" "r600/dri" "" "r600/xvmc"
> "r600/vdpau"
> DRICOMMON_NEED_LIBDRM=yes
> ;;
> xradeonsi)
> @@ -1794,7 +1761,7 @@ if test "x$with_gallium_drivers" != x; then
> gallium_require_drm_loader
> GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi"
> radeon_llvm_check
> - gallium_check_st "radeon/drm" "radeonsi/dri" "" "" ""
> "radeonsi/vdpau" ""
> + gallium_check_st "radeon/drm" "radeonsi/dri" "" ""
> "radeonsi/vdpau"
> DRICOMMON_NEED_LIBDRM=yes
> ;;
> xnouveau)
> @@ -1802,7 +1769,7 @@ if test "x$with_gallium_drivers" != x; then
> PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >=
> $LIBDRM_NOUVEAU_REQUIRED])
> gallium_require_drm_loader
> GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau"
> - gallium_check_st "nouveau/drm" "dri-nouveau" "" ""
> "xvmc-nouveau" "vdpau-nouveau"
> + gallium_check_st "nouveau/drm" "dri-nouveau" "" "xvmc-nouveau"
> "vdpau-nouveau"
> DRICOMMON_NEED_LIBDRM=yes
> ;;
> xfreedreno)
> @@ -1810,7 +1777,7 @@ if test "x$with_gallium_drivers" != x; then
> PKG_CHECK_MODULES([FREEDRENO], [libdrm_freedreno >=
> $LIBDRM_FREEDRENO_REQUIRED])
> gallium_require_drm_loader
> GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS freedreno"
> - gallium_check_st "freedreno/drm" "dri-freedreno" "" "" "" ""
> + gallium_check_st "freedreno/drm" "dri-freedreno" "" "" ""
> DRICOMMON_NEED_LIBDRM=yes
> ;;
> xswrast)
> @@ -2013,7 +1980,6 @@ AC_CONFIG_FILES([Makefile
> src/gallium/state_trackers/vdpau/Makefile
> src/gallium/state_trackers/vega/Makefile
> src/gallium/state_trackers/xa/Makefile
> - src/gallium/state_trackers/xorg/Makefile
> src/gallium/state_trackers/xvmc/Makefile
> src/gallium/targets/Makefile
> src/gallium/targets/dri-freedreno/Makefile
> diff --git a/src/gallium/SConscript b/src/gallium/SConscript
> index f4f6df2..c68519d 100644
> --- a/src/gallium/SConscript
> +++ b/src/gallium/SConscript
> @@ -45,9 +45,6 @@ if not env['embedded']:
> if env['dri']:
> SConscript('state_trackers/dri/SConscript')
>
> - if env['dri'] and env['xorg']:
> - SConscript('state_trackers/xorg/SConscript')
> -
> if env['platform'] == 'windows':
> SConscript('state_trackers/wgl/SConscript')
>
> diff --git a/src/gallium/state_trackers/Makefile.am
> b/src/gallium/state_trackers/Makefile.am
> index fabe271..03666c4 100644
> --- a/src/gallium/state_trackers/Makefile.am
> +++ b/src/gallium/state_trackers/Makefile.am
> @@ -41,10 +41,6 @@ if HAVE_GALLIUM_GBM
> SUBDIRS += gbm
> endif
>
> -if HAVE_ST_XORG
> -SUBDIRS += xorg
> -endif
> -
> if HAVE_ST_XA
> SUBDIRS += xa
> endif
--
Pengutronix e.K. | Lucas Stach |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
