[Mesa-dev] [PATCH 1/2] configure.ac: remove enable flags for EGL and GBM Gallium state trackers

[Pekka Paalanen]

On Tue,  4 Nov 2014 23:42:44 +0100
Marek Olšák <maraeo at gmail.com> wrote:

> From: Marek Olšák <marek.olsak at amd.com>

Btw. would have been *really* nice if the commit message here explained
why you do this and what all things it intentionally breaks, before
pushing it.


Thanks,
pq


> ---
>  configure.ac            | 74 +++----------------------------------------------
>  docs/egl.html           |  7 -----
>  src/gallium/Makefile.am |  8 ------
>  3 files changed, 4 insertions(+), 85 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index fc7d372..91e111b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -697,20 +697,6 @@ AC_ARG_ENABLE([xlib-glx],
>          [make GLX library Xlib-based instead of DRI-based @<:@default=disabled@:>@])],
>      [enable_xlib_glx="$enableval"],
>      [enable_xlib_glx=no])
> -AC_ARG_ENABLE([gallium-egl],
> -    [AS_HELP_STRING([--enable-gallium-egl],
> -        [enable optional EGL state tracker (not required
> -         for EGL support in Gallium with OpenGL and OpenGL ES)
> -         @<:@default=disabled@:>@])],
> -    [enable_gallium_egl="$enableval"],
> -    [enable_gallium_egl=no])
> -AC_ARG_ENABLE([gallium-gbm],
> -    [AS_HELP_STRING([--enable-gallium-gbm],
> -        [enable optional gbm state tracker (not required for
> -         gbm support in Gallium)
> -         @<:@default=auto@:>@])],
> -    [enable_gallium_gbm="$enableval"],
> -    [enable_gallium_gbm=auto])
>  
>  AC_ARG_ENABLE([r600-llvm-compiler],
>      [AS_HELP_STRING([--enable-r600-llvm-compiler],
> @@ -1314,51 +1300,6 @@ AM_CONDITIONAL(HAVE_EGL, test "x$enable_egl" = xyes)
>  AC_SUBST([EGL_LIB_DEPS])
>  
>  dnl
> -dnl EGL Gallium configuration
> -dnl
> -if test "x$enable_gallium_egl" = xyes; then
> -    if test -z "$with_gallium_drivers"; then
> -        AC_MSG_ERROR([cannot enable egl_gallium without Gallium])
> -    fi
> -    if test "x$enable_egl" = xno; then
> -        AC_MSG_ERROR([cannot enable egl_gallium without EGL])
> -    fi
> -    if test "x$have_libdrm" != xyes; then
> -        AC_MSG_ERROR([egl_gallium requires libdrm >= $LIBDRM_REQUIRED])
> -    fi
> -# XXX: Uncomment once converted to use static/shared pipe-drivers
> -#    enable_gallium_loader=$enable_shared_pipe_drivers
> -fi
> -AM_CONDITIONAL(HAVE_GALLIUM_EGL, test "x$enable_gallium_egl" = xyes)
> -
> -dnl
> -dnl gbm Gallium configuration
> -dnl
> -if test "x$enable_gallium_gbm" = xauto; then
> -    case "$enable_gbm$enable_gallium_egl$enable_dri$with_egl_platforms" in
> -        yesyesyes*drm*)
> -            enable_gallium_gbm=yes ;;
> -         *)
> -            enable_gallium_gbm=no ;;
> -    esac
> -fi
> -if test "x$enable_gallium_gbm" = xyes; then
> -    if test -z "$with_gallium_drivers"; then
> -        AC_MSG_ERROR([cannot enable gbm_gallium without Gallium])
> -    fi
> -    if test "x$enable_gbm" = xno; then
> -        AC_MSG_ERROR([cannot enable gbm_gallium without gbm])
> -    fi
> -
> -    if test "x$enable_gallium_egl" != xyes; then
> -        AC_MSG_ERROR([gbm_gallium is only used by egl_gallium])
> -    fi
> -
> -    enable_gallium_loader=$enable_shared_pipe_drivers
> -fi
> -AM_CONDITIONAL(HAVE_GALLIUM_GBM, test "x$enable_gallium_gbm" = xyes)
> -
> -dnl
>  dnl XA configuration
>  dnl
>  if test "x$enable_xa" = xyes; then
> @@ -1386,9 +1327,9 @@ if test "x$enable_openvg" = xyes; then
>      if test -z "$with_gallium_drivers"; then
>          AC_MSG_ERROR([cannot enable OpenVG without Gallium])
>      fi
> -    if test "x$enable_gallium_egl" = xno; then
> -        AC_MSG_ERROR([cannot enable OpenVG without egl_gallium])
> -    fi
> +
> +    AC_MSG_ERROR([Cannot enable OpenVG, because egl_gallium has been removed and
> +                  OpenVG hasn't been integrated into standard libEGL yet])
>  
>      EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'
>      VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS $PTHREAD_LIBS"
> @@ -2170,8 +2111,6 @@ AC_CONFIG_FILES([Makefile
>  		src/gallium/drivers/vc4/kernel/Makefile
>  		src/gallium/state_trackers/clover/Makefile
>  		src/gallium/state_trackers/dri/Makefile
> -		src/gallium/state_trackers/egl/Makefile
> -		src/gallium/state_trackers/gbm/Makefile
>  		src/gallium/state_trackers/glx/xlib/Makefile
>  		src/gallium/state_trackers/omx/Makefile
>  		src/gallium/state_trackers/osmesa/Makefile
> @@ -2307,12 +2246,7 @@ if test "$enable_egl" = yes; then
>          egl_drivers="$egl_drivers builtin:egl_dri2"
>      fi
>  
> -    if test "x$enable_gallium_egl" = xyes; then
> -        echo "        EGL drivers:    ${egl_drivers} egl_gallium"
> -        echo "        EGL Gallium STs:$EGL_CLIENT_APIS"
> -    else
> -        echo "        EGL drivers:    $egl_drivers"
> -    fi
> +    echo "        EGL drivers:    $egl_drivers"
>  fi
>  
>  echo ""
> diff --git a/docs/egl.html b/docs/egl.html
> index eebb8c7..e77c235 100644
> --- a/docs/egl.html
> +++ b/docs/egl.html
> @@ -77,13 +77,6 @@ drivers will be installed to <code>${libdir}/egl</code>.</p>
>  
>  </dd>
>  
> -<dt><code>--enable-gallium-egl</code></dt>
> -<dd>
> -
> -<p>Enable the optional <code>egl_gallium</code> driver.</p>
> -
> -</dd>
> -
>  <dt><code>--with-egl-platforms</code></dt>
>  <dd>
>  
> diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
> index 21595a1..ca10c0e 100644
> --- a/src/gallium/Makefile.am
> +++ b/src/gallium/Makefile.am
> @@ -138,14 +138,6 @@ if HAVE_OPENVG
>  SUBDIRS += state_trackers/vega
>  endif
>  
> -if HAVE_GALLIUM_EGL
> -SUBDIRS += state_trackers/egl targets/egl-static
> -endif
> -
> -if HAVE_GALLIUM_GBM
> -SUBDIRS += state_trackers/gbm targets/gbm
> -endif
> -
>  if HAVE_X11_DRIVER
>  SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
>  endif