From 1ac40173c2abf402150ffa245d03664b159e89e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 18 Oct 2016 23:47:01 +0200 Subject: [PATCH] configure.ac: simplify EGL requirements for drivers dependent on EGL Reviewed-by: Emil Velikov --- configure.ac | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 30817d867f9..4761c5972e8 100644 --- a/configure.ac +++ b/configure.ac @@ -2296,22 +2296,21 @@ gallium_require_llvm() { fi } -dnl This is for Glamor. Skip this if OpenGL is disabled. -require_egl_drm() { - if test "x$enable_opengl" = xno; then - return 0 - fi - +dnl +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 - *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 - if test "x$enable_gbm" != xyes; then - AC_MSG_ERROR([--enable-gbm is required to build the $1 driver.]) - fi } radeon_llvm_check() { @@ -2427,7 +2426,7 @@ if test -n "$with_gallium_drivers"; then PKG_CHECK_MODULES([AMDGPU], [libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED]) require_libdrm "radeonsi" radeon_gallium_llvm_check "radeonsi" "3" "6" "0" - require_egl_drm "radeonsi" + require_basic_egl "radeonsi" ;; xnouveau) HAVE_GALLIUM_NOUVEAU=yes @@ -2478,7 +2477,7 @@ if test -n "$with_gallium_drivers"; then xvirgl) HAVE_GALLIUM_VIRGL=yes require_libdrm "virgl" - require_egl_drm "virgl" + require_basic_egl "virgl" ;; *) AC_MSG_ERROR([Unknown Gallium driver: $driver]) -- 2.30.2