From 3e079c3f86981dbfec81352a57dc9f2f1f01f115 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 9 Sep 2016 15:42:31 +0100 Subject: [PATCH] configure.ac: remove no longer needed *_pci_id logic MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Previously it was used to differentiate between the different codepaths in the loader. Although strictly speaking the (core) of the loader is only used when a hardware device is available. The latter of which in itself requires libdrm (one of the codepaths available). That said, all the configure toggles which relate to enabling/using hw device should attribute and require libdrm, so there's no need to keep this code around. With this gallium_require_drm_loader becomes an empty stub, so nuke that one as well. Signed-off-by: Emil Velikov Reviewed-by: Axel Davy Reviewed-by: Nicolai Hähnle --- configure.ac | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/configure.ac b/configure.ac index 10cf7ca6e49..1694877155b 100644 --- a/configure.ac +++ b/configure.ac @@ -1349,13 +1349,6 @@ if test "x$enable_shader_cache" = "xyes"; then AC_DEFINE([ENABLE_SHADER_CACHE], [1], [Enable shader cache]) fi -case "$host_os" in -linux*) - need_pci_id=yes ;; -*) - need_pci_id=no ;; -esac - if test "x$enable_dri" = xyes; then if test "$enable_static" = yes; then AC_MSG_ERROR([Cannot use static libraries for DRI drivers]) @@ -1444,11 +1437,6 @@ xdri) ;; esac -have_pci_id=no -if test "$have_libdrm" = yes; then - have_pci_id=yes -fi - # This is outside the case (above) so that it is invoked even for non-GLX # builds. AM_CONDITIONAL(HAVE_XF86VIDMODE, test "x$HAVE_XF86VIDMODE" = xyes) @@ -1557,10 +1545,6 @@ if test "x$enable_dri" = xyes; then DEFINES="$DEFINES -DHAVE_DRI3" fi - if test "x$have_pci_id" != xyes; then - AC_MSG_ERROR([libdrm >= $LIBDRM_REQUIRED required for building DRI]) - fi - case "$host_cpu" in powerpc* | sparc*) # Build only the drivers for cards that exist on PowerPC/sparc @@ -1775,10 +1759,6 @@ if test "x$enable_gbm" = xauto; then esac fi if test "x$enable_gbm" = xyes; then - if test "x$need_pci_id$have_pci_id" = xyesno; then - AC_MSG_ERROR([gbm requires libdrm >= $LIBDRM_REQUIRED]) - fi - if test "x$enable_dri" = xyes; then if test "x$enable_shared_glapi" = xno; then AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi]) @@ -2087,11 +2067,6 @@ for plat in $egl_platforms; do AC_MSG_ERROR([EGL platform '$plat' does not exist]) ;; esac - - case "$plat$need_pci_id$have_pci_id" in - waylandyesno|drmyesno) - AC_MSG_ERROR([cannot build $plat platform without libdrm >= $LIBDRM_REQUIRED]) ;; - esac done # libEGL wants to default to the first platform specified in @@ -2326,12 +2301,6 @@ gallium_require_llvm() { fi } -gallium_require_drm_loader() { - if test "x$need_pci_id$have_pci_id" = xyesno; then - AC_MSG_ERROR([Gallium drm loader requires libdrm >= $LIBDRM_REQUIRED]) - fi -} - dnl This is for Glamor. Skip this if OpenGL is disabled. require_egl_drm() { if test "x$enable_opengl" = xno; then @@ -2431,32 +2400,27 @@ if test -n "$with_gallium_drivers"; then xsvga) HAVE_GALLIUM_SVGA=yes gallium_require_drm "svga" - gallium_require_drm_loader ;; xi915) HAVE_GALLIUM_I915=yes PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) gallium_require_drm "Gallium i915" - gallium_require_drm_loader ;; xilo) HAVE_GALLIUM_ILO=yes PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) gallium_require_drm "Gallium i965/ilo" - gallium_require_drm_loader ;; xr300) HAVE_GALLIUM_R300=yes PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) gallium_require_drm "Gallium R300" - gallium_require_drm_loader gallium_require_llvm "Gallium R300" ;; xr600) HAVE_GALLIUM_R600=yes PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) gallium_require_drm "Gallium R600" - gallium_require_drm_loader if test "x$enable_opencl" = xyes; then radeon_gallium_llvm_check "r600g" "3" "6" "0" LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser" @@ -2467,7 +2431,6 @@ if test -n "$with_gallium_drivers"; then 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" ;; @@ -2475,13 +2438,11 @@ if test -n "$with_gallium_drivers"; then 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]) gallium_require_drm "freedreno" - gallium_require_drm_loader ;; xswrast) HAVE_GALLIUM_SOFTPIPE=yes @@ -2513,7 +2474,6 @@ if test -n "$with_gallium_drivers"; then HAVE_GALLIUM_VC4=yes PKG_CHECK_MODULES([VC4], [libdrm_vc4 >= $LIBDRM_VC4_REQUIRED]) gallium_require_drm "vc4" - gallium_require_drm_loader PKG_CHECK_MODULES([SIMPENROSE], [simpenrose], [USE_VC4_SIMULATOR=yes; @@ -2523,7 +2483,6 @@ if test -n "$with_gallium_drivers"; then xvirgl) HAVE_GALLIUM_VIRGL=yes gallium_require_drm "virgl" - gallium_require_drm_loader require_egl_drm "virgl" ;; *) -- 2.30.2