[Mesa-dev] [PATCH v4 11/18] configure.ac: Remove swr_llvm_check()

Emil Velikov emil.l.velikov at gmail.com
Wed Oct 19 12:55:16 UTC 2016


On 16 October 2016 at 01:20, Tobias Droste <tdroste at gmx.de> wrote:
> No need for an additional function here.
> Use the same style for LLVM checks as the other drivers
> (e.g. r300, llvmpipe) that don't need a load of other checks.
> Instead of open conding the LLVM version check, use the
> function used by other drivers.
>
> "enable_gallium_llvm" is checked by gallium_require_llvm().
>
> Signed-off-by: Tobias Droste <tdroste at gmx.de>
> ---
>  configure.ac | 13 ++-----------
>  1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 6a1e5c4..35034d3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2427,16 +2427,6 @@ radeon_gallium_llvm_check() {
>      radeon_llvm_check $*
>  }
>
> -swr_llvm_check() {
> -    gallium_require_llvm $1
> -    if test ${LLVM_VERSION_INT} -lt 306; then
> -        AC_MSG_ERROR([LLVM version 3.6 or later required when building $1])
> -    fi
> -    if test "x$enable_gallium_llvm" != "xyes"; then
> -        AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
> -    fi
> -}
> -
>  swr_require_cxx_feature_flags() {
>      feature_name="$1"
>      preprocessor_test="$2"
> @@ -2545,7 +2535,8 @@ if test -n "$with_gallium_drivers"; then
>              fi
>              ;;
>          xswr)
> -            swr_llvm_check "swr"
> +            llvm_check_version_for "3" "6" "0" "swr"
> +            gallium_require_llvm "swr"
>
Nit: Might be worth flipping the two ?
I can sort that one before pushing.

Emil


More information about the mesa-dev mailing list