diff --git a/configs/autoconf.in b/configs/autoconf.in
index 3428e3a2944..417138b2a1f 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -97,7 +97,7 @@ GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drive
# Driver specific build vars
DRI_DIRS = @DRI_DIRS@
-EGL_DISPLAYS = @EGL_DISPLAYS@
+EGL_PLATFORMS = @EGL_PLATFORMS@
EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
# Dependencies
diff --git a/configs/default b/configs/default
index 9241e807977..3d9744409ae 100644
--- a/configs/default
+++ b/configs/default
@@ -110,8 +110,8 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib
GALLIUM_TARGET_DIRS = libgl-xlib
GALLIUM_STATE_TRACKERS_DIRS = glx vega
-# native displays EGL should support
-EGL_DISPLAYS = x11
+# native platforms EGL should support
+EGL_PLATFORMS = x11
EGL_CLIENT_APIS = $(GL_LIB)
# Library dependencies
diff --git a/configure.ac b/configure.ac
index 7089a87075f..21123eccccb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1301,18 +1301,22 @@ if test "x$HAVE_ST_XORG" = xyes; then
HAVE_XEXTPROTO_71="no")
fi
+AC_ARG_WITH([egl-platforms],
+ [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
+ [comma delimited native platforms libEGL supports, e.g.
+ "x11,kms" @<:@default=auto@:>@])],
+ [with_egl_platforms="$withval"],
+ [with_egl_platforms=yes])
AC_ARG_WITH([egl-displays],
[AS_HELP_STRING([--with-egl-displays@<:@=DIRS...@:>@],
- [comma delimited native displays libEGL supports, e.g.
- "x11,kms" @<:@default=auto@:>@])],
- [with_egl_displays="$withval"],
- [with_egl_displays=yes])
+ [DEPRECATED. Use --with-egl-platforms instead])],
+ [with_egl_platforms="$withval"])
-EGL_DISPLAYS=""
-case "$with_egl_displays" in
+EGL_PLATFORMS=""
+case "$with_egl_platforms" in
yes)
if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then
- EGL_DISPLAYS="x11"
+ EGL_PLATFORMS="x11"
fi
;;
*)
@@ -1320,18 +1324,18 @@ yes)
AC_MSG_ERROR([cannot build egl state tracker without EGL library])
fi
# verify the requested driver directories exist
- egl_displays=`IFS=', '; echo $with_egl_displays`
- for dpy in $egl_displays; do
- test -d "$srcdir/src/gallium/state_trackers/egl/$dpy" || \
- AC_MSG_ERROR([EGL display '$dpy' does't exist])
- if test "$dpy" = "fbdev"; then
+ egl_platforms=`IFS=', '; echo $with_egl_platforms`
+ for plat in $egl_platforms; do
+ test -d "$srcdir/src/gallium/state_trackers/egl/$plat" || \
+ AC_MSG_ERROR([EGL platform '$plat' does't exist])
+ if test "$plat" = "fbdev"; then
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"
fi
done
- EGL_DISPLAYS="$egl_displays"
+ EGL_PLATFORMS="$egl_platforms"
;;
esac
-AC_SUBST([EGL_DISPLAYS])
+AC_SUBST([EGL_PLATFORMS])
AC_ARG_WITH([egl-driver-dir],
[AS_HELP_STRING([--with-egl-driver-dir=DIR],
@@ -1579,7 +1583,7 @@ echo " Shared libs: $enable_shared"
echo " Static libs: $enable_static"
if test "$enable_egl" = yes; then
echo " EGL: $EGL_DRIVERS_DIRS"
- echo " EGL displays: $EGL_DISPLAYS"
+ echo " EGL platforms: $EGL_PLATFORMS"
else
echo " EGL: no"
fi
diff --git a/docs/egl.html b/docs/egl.html
index 559bd990469..b2198e931d0 100644
--- a/docs/egl.html
+++ b/docs/egl.html
@@ -69,17 +69,17 @@ drivers will be installed to ${libdir}/egl
.
--with-egl-displays
+--with-egl-platforms
-List the window system(s) to support. It is by default x11
,
-which supports the X Window System. Its argument is a comma separated string
-like, for example, --with-egl-displays=x11,kms
. Because an EGL
-driver decides which window system to support, this example will enable two
-(sets of) EGL drivers. One supports the X window system and the other supports
-bare KMS (kernel modesetting).
List the native platform window system(s) to support. It is by default
+x11
, which supports the X Window System. Its argument is a comma
+separated string like, for example, --with-egl-platforms=x11,kms
.
+Because an EGL driver decides which window system to support, this example will
+enable two (sets of) EGL drivers. One supports the X window system and the
+other supports bare KMS (kernel modesetting).
The available displays are x11
, kms
,
-fbdev
, and gdi
. The gdi
display can
+
The available platforms are x11
, kms
,
+fbdev
, and gdi
. The gdi
platform can
only be built with SCons.
EGL_DISPLAY
+EGL_PLATFORM
When EGL_DRIVER
is not set, the main library loads all
-EGL drivers that support a certain window system. EGL_DISPLAY
can
-be used to specify the window system and the valid values are, for example,
+EGL drivers that support a certain window system. EGL_PLATFORM
+can be used to specify the window system and the valid values are, for example,
x11
or kms
. When the variable is not set, the main
library defaults the value to the first window system listed in
---with-egl-displays
at configuration time.
+--with-egl-platforms
at configuration time.
egl_<dpy>_vmwgfx
<dpy>
is given by --with-egl-displays
at
+
<dpy>
is given by --with-egl-platforms
at
configuration time. There is usually one EGL driver for each combination of
-the displays listed and the pipe drivers enabled. When the display is pure
+the platforms listed and the pipe drivers enabled. When the platform is pure
software or pure hardware, non-working combinations will not be built.
Classic EGL drivers, on the other hand, support only a subset of the @@ -322,7 +322,7 @@ should as well lock the display before using it.
EGL_DISPLAY
loads all
+EGL_PLATFORM
loads all
drivers and might eat too much memory.