[Mesa-dev] [PATCH 1/6] configure.ac: remove redundant option --enable-gallium-egl

[Benjamin Franzke]

Removing this flag seems right to me, but always building the egl
state tracker when gallium and egl is enabled not.
So when --with-state-trackers is also removed, we'd need a new
--with-egl-drivers=auto|gallium,dri2,glx or so.

The usecase is that you could choose to use st/dri together with
egl_dri2, if you dont want to have the additional pipe drivers for the
egl state tracker around.
Also for distributions egl_dri2 is probably the preferred driver as
its the smoothest in comibination with classic intel dri drivers and
gallium- vs classic-driver decisions for dri drivers (like the
post-install gallium/classic switch in gentoo).
I understand that the last argument may be not be valid as all classic
drivers that have gallium adequates are deprected.

Ben

2011/6/14 Marek Olšák <maraeo at gmail.com>:
> We already have --enable-gallium, --enable-egl, and --with-state-trackers=egl.
> ---
>  configure.ac |   30 ++++--------------------------
>  1 files changed, 4 insertions(+), 26 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 69513c1..90171fa 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1201,6 +1201,9 @@ if test "x$enable_egl" = xyes; then
>     SRC_DIRS="$SRC_DIRS egl"
>     EGL_LIB_DEPS="$DLOPEN_LIBS $SELINUX_LIBS -lpthread"
>     EGL_DRIVERS_DIRS=""
> +    GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
> +    HAVE_ST_EGL="yes"
> +
>     if test "$enable_static" != yes; then
>         # build egl_glx when libGL is built
>         if test "$mesa_driver" = xlib -o "$mesa_driver" = dri; then
> @@ -1470,26 +1473,6 @@ dnl
>  dnl Gallium state trackers configuration
>  dnl
>
> -AC_ARG_ENABLE([gallium-egl],
> -    [AS_HELP_STRING([--enable-gallium-egl],
> -        [enable gallium EGL state tracker @<:@default=auto@:>@])],
> -    [enable_gallium_egl="$enableval"],
> -    [enable_gallium_egl=auto])
> -if test "x$enable_gallium_egl" = xauto; then
> -    case "$mesa_driver" in
> -    dri|no)
> -        enable_gallium_egl=$enable_egl
> -        ;;
> -    *)
> -        enable_gallium_egl=$enable_openvg
> -        ;;
> -    esac
> -fi
> -case "x$enable_egl$enable_gallium_egl" in
> -xnoyes)
> -    AC_MSG_ERROR([cannot build Gallium EGL state tracker without EGL])
> -esac
> -
>  AC_ARG_WITH([state-trackers],
>     [AS_HELP_STRING([--with-state-trackers@<:@=DIRS...@:>@],
>         [comma delimited state_trackers list, e.g.
> @@ -1522,11 +1505,6 @@ yes)
>             GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vega"
>             st_egl="yes"
>         fi
> -
> -        if test "$enable_gallium_egl" = yes; then
> -            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
> -            HAVE_ST_EGL="yes"
> -        fi
>     fi
>     ;;
>  *)
> @@ -1577,7 +1555,7 @@ yes)
>     if test "x$have_st_vega" != xyes -a "x$enable_openvg" = xyes; then
>         AC_MSG_ERROR([--with-state-trackers specified but vega is missing])
>     fi
> -    if test "x$HAVE_ST_EGL" != xyes -a "x$enable_gallium_egl" = xyes; then
> +    if test "x$HAVE_ST_EGL" != xyes; then
>         AC_MSG_ERROR([--with-state-trackers specified but egl is missing])
>     fi
>     ;;
> --
> 1.7.4.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>