configure.ac: simplify EGL requirements for drivers dependent on EGL

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Marek Olšák 2016-10-18 23:47:01 +02:00
parent b687f766fd
commit 1ac40173c2

View file

@ -2296,22 +2296,21 @@ gallium_require_llvm() {
fi fi
} }
dnl This is for Glamor. Skip this if OpenGL is disabled. dnl
require_egl_drm() { dnl DRM is needed by X, Wayland, and offscreen rendering.
if test "x$enable_opengl" = xno; then dnl Surfaceless is an alternative for the last one.
return 0 dnl
fi require_basic_egl() {
case "$with_egl_platforms" in case "$with_egl_platforms" in
*drm*) *drm*|*surfaceless*)
;; ;;
*) *)
AC_MSG_ERROR([--with-egl-platforms=drm is required to build the $1 driver.]) AC_MSG_ERROR([$1 requires one of these:
1) --with-egl-platforms=drm (X, Wayland, offscreen rendering based on DRM)
2) --with-egl-platforms=surfaceless (offscreen only)
Recommended options: drm,x11])
;; ;;
esac esac
if test "x$enable_gbm" != xyes; then
AC_MSG_ERROR([--enable-gbm is required to build the $1 driver.])
fi
} }
radeon_llvm_check() { radeon_llvm_check() {
@ -2427,7 +2426,7 @@ if test -n "$with_gallium_drivers"; then
PKG_CHECK_MODULES([AMDGPU], [libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED]) PKG_CHECK_MODULES([AMDGPU], [libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED])
require_libdrm "radeonsi" require_libdrm "radeonsi"
radeon_gallium_llvm_check "radeonsi" "3" "6" "0" radeon_gallium_llvm_check "radeonsi" "3" "6" "0"
require_egl_drm "radeonsi" require_basic_egl "radeonsi"
;; ;;
xnouveau) xnouveau)
HAVE_GALLIUM_NOUVEAU=yes HAVE_GALLIUM_NOUVEAU=yes
@ -2478,7 +2477,7 @@ if test -n "$with_gallium_drivers"; then
xvirgl) xvirgl)
HAVE_GALLIUM_VIRGL=yes HAVE_GALLIUM_VIRGL=yes
require_libdrm "virgl" require_libdrm "virgl"
require_egl_drm "virgl" require_basic_egl "virgl"
;; ;;
*) *)
AC_MSG_ERROR([Unknown Gallium driver: $driver]) AC_MSG_ERROR([Unknown Gallium driver: $driver])