diff options
| -rw-r--r-- | configure.ac | 36 | ||||
| -rw-r--r-- | docs/egl.html | 12 | ||||
| -rw-r--r-- | docs/releasing.html | 2 | ||||
| -rw-r--r-- | src/egl/main/egldisplay.c | 2 |
4 files changed, 25 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 798aaeb2e90..2c930004cfb 100644 --- a/configure.ac +++ b/configure.ac @@ -1666,9 +1666,9 @@ AC_ARG_WITH([platforms], [with_platforms="$withval"], [with_platforms=auto]) -# For the time being, we still reuse the EGL named variables/defines. -if test "x$with_platforms" != xauto; then - with_egl_platforms=$with_platforms +# Reuse the autodetection rather than duplicating it. +if test "x$with_platforms" = xauto; then + with_platforms=$with_egl_platforms fi PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], @@ -1678,16 +1678,16 @@ if test "x$WAYLAND_SCANNER" = x; then AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) fi -# Do per-EGL platform setups and checks -egl_platforms=`IFS=', '; echo $with_egl_platforms` -for plat in $egl_platforms; do +# Do per platform setups and checks +platforms=`IFS=', '; echo $with_platforms` +for plat in $platforms; do case "$plat" in wayland) PKG_CHECK_MODULES([WAYLAND], [wayland-client >= $WAYLAND_REQUIRED wayland-server >= $WAYLAND_REQUIRED]) if test "x$WAYLAND_SCANNER" = "x:"; then - AC_MSG_ERROR([wayland-scanner is needed to compile the wayland egl platform]) + AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) fi ;; @@ -1708,7 +1708,7 @@ for plat in $egl_platforms; do ;; *) - AC_MSG_ERROR([EGL platform '$plat' does not exist]) + AC_MSG_ERROR([platform '$plat' does not exist]) ;; esac @@ -1719,11 +1719,11 @@ for plat in $egl_platforms; do esac done -AM_CONDITIONAL(HAVE_PLATFORM_X11, echo "$egl_platforms" | grep -q 'x11') -AM_CONDITIONAL(HAVE_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q 'wayland') -AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm') -AM_CONDITIONAL(HAVE_PLATFORM_SURFACELESS, echo "$egl_platforms" | grep -q 'surfaceless') -AM_CONDITIONAL(HAVE_PLATFORM_ANDROID, echo "$egl_platforms" | grep -q 'android') +AM_CONDITIONAL(HAVE_PLATFORM_X11, echo "$platforms" | grep -q 'x11') +AM_CONDITIONAL(HAVE_PLATFORM_WAYLAND, echo "$platforms" | grep -q 'wayland') +AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo "$platforms" | grep -q 'drm') +AM_CONDITIONAL(HAVE_PLATFORM_SURFACELESS, echo "$platforms" | grep -q 'surfaceless') +AM_CONDITIONAL(HAVE_PLATFORM_ANDROID, echo "$platforms" | grep -q 'android') dnl dnl More DRI setup @@ -2230,8 +2230,8 @@ AM_CONDITIONAL(HAVE_GALLIUM, test -n "$with_gallium_drivers") # libEGL wants to default to the first platform specified in # ./configure. parse that here. -if test "x$egl_platforms" != "x"; then - FIRST_PLATFORM_CAPS=`echo $egl_platforms | sed 's| .*||' | tr '[[a-z]]' '[[A-Z]]'` +if test "x$platforms" != "x"; then + FIRST_PLATFORM_CAPS=`echo $platforms | sed 's| .*||' | tr '[[a-z]]' '[[A-Z]]'` EGL_NATIVE_PLATFORM="_EGL_PLATFORM_$FIRST_PLATFORM_CAPS" else EGL_NATIVE_PLATFORM="_EGL_INVALID_PLATFORM" @@ -2242,7 +2242,7 @@ AC_SUBST([EGL_CFLAGS]) # If we don't have the X11 platform, set this define so we don't try to include # the X11 headers. -if ! echo "$egl_platforms" | grep -q 'x11'; then +if ! echo "$platforms" | grep -q 'x11'; then DEFINES="$DEFINES -DMESA_EGL_NO_X11_HEADERS" GL_PC_CFLAGS="$GL_PC_CFLAGS -DMESA_EGL_NO_X11_HEADERS" fi @@ -2312,7 +2312,7 @@ dnl DRM is needed by X, Wayland, and offscreen rendering. dnl Surfaceless is an alternative for the last one. dnl require_basic_egl() { - case "$with_egl_platforms" in + case "$with_platforms" in *drm*|*surfaceless*) ;; *) @@ -2867,7 +2867,7 @@ else echo " GBM: no" fi - echo " EGL/Vulkan/VL platforms: $egl_platforms" + echo " EGL/Vulkan/VL platforms: $platforms" # Vulkan echo "" diff --git a/docs/egl.html b/docs/egl.html index 17823c2b0fa..f072ce1a045 100644 --- a/docs/egl.html +++ b/docs/egl.html @@ -77,15 +77,13 @@ drivers will be installed to <code>${libdir}/egl</code>.</p> </dd> -<dt><code>--with-egl-platforms</code></dt> +<dt><code>--with-platforms</code></dt> <dd> <p>List the platforms (window systems) to support. Its argument is a comma -separated string such as <code>--with-egl-platforms=x11,drm</code>. It decides +separated string such as <code>--with-platforms=x11,drm</code>. It decides the platforms a driver may support. The first listed platform is also used by -the main library to decide the native platform: this defines EGL native -types such as <code>EGLNativeDisplayType</code> or -<code>EGLNativeWindowType</code>.</p> +the main library to decide the native platform.</p> <p>The available platforms are <code>x11</code>, <code>drm</code>, <code>wayland</code>, <code>surfaceless</code>, <code>android</code>, @@ -167,9 +165,9 @@ binaries.</p> <dd> <p>This variable specifies the native platform. The valid values are the same -as those for <code>--with-egl-platforms</code>. When the variable is not set, +as those for <code>--with-platforms</code>. When the variable is not set, the main library uses the first platform listed in -<code>--with-egl-platforms</code> as the native platform.</p> +<code>--with-platforms</code> as the native platform.</p> <p>Extensions like <code>EGL_MESA_drm_display</code> define new functions to create displays for non-native platforms. These extensions are usually used by diff --git a/docs/releasing.html b/docs/releasing.html index e2206b539a9..38d59f6debb 100644 --- a/docs/releasing.html +++ b/docs/releasing.html @@ -460,7 +460,7 @@ Here is one solution that I've been using. --enable-glx-tls \ --enable-gbm \ --enable-egl \ - --with-egl-platforms=x11,drm,wayland + --with-platforms=x11,drm,wayland make -j2 && DESTDIR=`pwd`/test make -j6 install __glxinfo_cmd='glxinfo 2>&1 | egrep -o "Mesa.*|Gallium.*|.*dri\.so"' __glxgears_cmd='glxgears 2>&1 | grep -v "configuration file"' diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index 6dda4e5e86f..2a1f02738df 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -61,7 +61,7 @@ /** - * Map --with-egl-platforms names to platform types. + * Map --with-platforms names to platform types. */ static const struct { _EGLPlatformType platform; |