From: Deepak Sharma <deepak.sha...@amd.com>
This allows building radeonsi driver for surfaceless platform.
If we get any other requirements, we'll fix them in the function.
Removing the function isn't a solution.
v2: cosmetic changes - Marek
Signed-off-by: Deepak Sharma <deepak.sha...@amd.com> (v1)
Signed-off-by: Marek Olšák <marek.ol...@amd.com>
---
configure.ac | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index b414edd..30cac19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2345,30 +2345,33 @@ gallium_require_llvm() {
esac
fi
}
gallium_require_drm_loader() {
if test "x$need_pci_id$have_pci_id" = xyesno; then
AC_MSG_ERROR([Gallium drm loader requires libudev >= $LIBUDEV_REQUIRED
or sysfs])
fi
}
-dnl This is for Glamor. Skip this if OpenGL is disabled.
-require_egl_drm() {
+# Check valid combinations of EGL platforms with GBM.
+check_glamor_requirements() {
if test "x$enable_opengl" = xno; then
return 0
fi
case "$with_egl_platforms" in
+ surfaceless)
+ return 0 # the user doesn't use Glamor and GBM.
+ ;;
*drm*)
;;
- *)
+ *)
AC_MSG_ERROR([--with-egl-platforms=drm is required to build the $1
driver.])
;;
esac
if test "x$enable_gbm" != xyes; then
AC_MSG_ERROR([--enable-gbm is required to build the $1 driver.])
fi
}
radeon_llvm_check() {
if test ${LLVM_VERSION_INT} -lt 307; then
@@ -2482,21 +2485,21 @@ if test -n "$with_gallium_drivers"; then
LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser"
fi
;;
xradeonsi)
HAVE_GALLIUM_RADEONSI=yes
PKG_CHECK_MODULES([RADEON], [libdrm_radeon >=
$LIBDRM_RADEON_REQUIRED])
PKG_CHECK_MODULES([AMDGPU], [libdrm_amdgpu >=
$LIBDRM_AMDGPU_REQUIRED])
gallium_require_drm "radeonsi"
gallium_require_drm_loader
radeon_gallium_llvm_check "radeonsi" "3" "6" "0"
- require_egl_drm "radeonsi"
+ check_glamor_requirements "radeonsi"
;;
xnouveau)
HAVE_GALLIUM_NOUVEAU=yes
PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >=
$LIBDRM_NOUVEAU_REQUIRED])
gallium_require_drm "nouveau"
gallium_require_drm_loader
;;
xfreedreno)
HAVE_GALLIUM_FREEDRENO=yes
PKG_CHECK_MODULES([FREEDRENO], [libdrm_freedreno >=
$LIBDRM_FREEDRENO_REQUIRED])
@@ -2537,21 +2540,21 @@ if test -n "$with_gallium_drivers"; then
PKG_CHECK_MODULES([SIMPENROSE], [simpenrose],
[USE_VC4_SIMULATOR=yes;
DEFINES="$DEFINES -DUSE_VC4_SIMULATOR"],
[USE_VC4_SIMULATOR=no])
;;
xvirgl)
HAVE_GALLIUM_VIRGL=yes
gallium_require_drm "virgl"
gallium_require_drm_loader
- require_egl_drm "virgl"
+ check_glamor_requirements "virgl"
;;
*)
AC_MSG_ERROR([Unknown Gallium driver: $driver])
;;
esac
done
fi
if test "x$HAVE_RADEON_VULKAN" = "xyes"; then
radeon_llvm_check "radv" "3" "9" "0"
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
