X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=d975b0dbf4be5dce360ceabeb48e863d6a6dc168;hb=385843ac3ce1b868d9e24fcb2dbc0c8d5f5a7c99;hp=1b475877827ef69dbce8c50e9dfb54147f0ffbb6;hpb=4fa2fb35245448f8b5d81fb5b37afec4f343f18a;p=mesa.git diff --git a/meson.build b/meson.build index 1b475877827..d975b0dbf4b 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017-2018 Intel Corporation +# Copyright © 2017-2019 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -34,8 +34,6 @@ cpp = meson.get_compiler('cpp') null_dep = dependency('', required : false) -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) - # Arguments for the preprocessor, put these in a separate array from the C and # C++ (cpp in meson terminology) arguments since they need to be added to the # default arguments for both C and C++. @@ -43,8 +41,7 @@ pre_args = [ '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS', '-D__STDC_LIMIT_MACROS', - '-DVERSION="@0@"'.format(meson.project_version()), - '-DPACKAGE_VERSION=VERSION', + '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()), '-DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa"', ] @@ -54,11 +51,12 @@ with_valgrind = get_option('valgrind') with_libunwind = get_option('libunwind') with_asm = get_option('asm') with_glx_read_only_text = get_option('glx-read-only-text') +with_glx_direct = get_option('glx-direct') with_osmesa = get_option('osmesa') with_swr_arches = get_option('swr-arches') with_tools = get_option('tools') if with_tools.contains('all') - with_tools = ['freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc'] + with_tools = ['etnaviv', 'freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc'] endif dri_drivers_path = get_option('dri-drivers-path') @@ -133,7 +131,7 @@ if _drivers.contains('auto') ] elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) _drivers = [ - 'pl111', 'v3d', 'vc4', 'freedreno', 'etnaviv', 'imx', 'nouveau', + 'kmsro', 'v3d', 'vc4', 'freedreno', 'etnaviv', 'nouveau', 'tegra', 'virgl', 'swrast', ] else @@ -147,7 +145,7 @@ if _drivers.contains('auto') host_machine.system())) endif endif -with_gallium_pl111 = _drivers.contains('pl111') +with_gallium_kmsro = _drivers.contains('kmsro') with_gallium_radeonsi = _drivers.contains('radeonsi') with_gallium_r300 = _drivers.contains('r300') with_gallium_r600 = _drivers.contains('r600') @@ -157,13 +155,20 @@ with_gallium_softpipe = _drivers.contains('swrast') with_gallium_vc4 = _drivers.contains('vc4') with_gallium_v3d = _drivers.contains('v3d') with_gallium_etnaviv = _drivers.contains('etnaviv') -with_gallium_imx = _drivers.contains('imx') with_gallium_tegra = _drivers.contains('tegra') with_gallium_i915 = _drivers.contains('i915') with_gallium_svga = _drivers.contains('svga') with_gallium_virgl = _drivers.contains('virgl') with_gallium_swr = _drivers.contains('swr') +if cc.get_id() == 'intel' + if meson.version().version_compare('< 0.49.0') + error('Meson does not have sufficient support of ICC before 0.49.0 to compile mesa') + elif with_gallium_swr and meson.version().version_compare('== 0.49.0') + warning('Meson as of 0.49.0 is sufficient for compiling mesa with ICC, but there are some caveats with SWR. 0.49.1 should resolve all of these') + endif +endif + with_gallium = _drivers.length() != 0 and _drivers != [''] if with_gallium and system_has_kms_drm @@ -204,11 +209,8 @@ endif if with_dri_i915 and with_gallium_i915 error('Only one i915 provider can be built') endif -if with_gallium_imx and not with_gallium_etnaviv - error('IMX driver requires etnaviv driver') -endif -if with_gallium_pl111 and not with_gallium_vc4 - error('pl111 driver requires vc4 driver') +if with_gallium_kmsro and not (with_gallium_vc4 or with_gallium_etnaviv or with_gallium_freedreno) + error('kmsro driver requires one or more renderonly drivers (vc4, etnaviv, freedreno)') endif if with_gallium_tegra and not with_gallium_nouveau error('tegra driver requires nouveau driver') @@ -223,8 +225,6 @@ elif system_has_kms_drm else # FIXME: haiku doesn't use dri, and xlib doesn't use dri, probably should # assert here that one of those cases has been met. - # FIXME: GNU (hurd) ends up here as well, but meson doesn't officially - # support Hurd at time of writing (2017/11) # FIXME: illumos ends up here as well with_dri_platform = 'none' endif @@ -370,9 +370,6 @@ if with_glvnd endif endif -# TODO: toggle for this -with_glx_direct = true - if with_vulkan_icd_dir == '' with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d') endif @@ -388,9 +385,9 @@ endif if with_any_vk and (with_platform_x11 and not with_dri3) error('Vulkan drivers require dri3 for X11 support') endif -if with_dri or with_gallium - if with_glx == 'disabled' and not with_egl and not with_platform_haiku - error('building dri or gallium drivers require at least one window system') +if with_dri + if with_glx == 'disabled' and not with_egl and not with_gbm and with_osmesa != 'classic' + error('building dri drivers require at least one windowing system or classic osmesa') endif endif @@ -620,7 +617,7 @@ if with_gallium_st_nine error('The nine state tracker requires gallium softpipe/llvmpipe.') elif not (with_gallium_radeonsi or with_gallium_nouveau or with_gallium_r600 or with_gallium_r300 or with_gallium_svga or with_gallium_i915) - error('The nine state tracker requires at least on non-swrast gallium driver.') + error('The nine state tracker requires at least one non-swrast gallium driver.') endif if not with_dri3 error('Using nine with wine requires dri3') @@ -628,7 +625,12 @@ if with_gallium_st_nine endif if get_option('power8') != 'false' - if host_machine.cpu_family() == 'ppc64le' + # on old versions of meson the cpu family would return as ppc64le on little + # endian power8, this was changed in 0.48 such that the family would always + # be ppc64 regardless of endianness, and the the machine.endian() value + # should be checked. Since we support versions < 0.48 we need to use + # startswith. + if host_machine.cpu_family().startswith('ppc64') and host_machine.endian() == 'little' if cc.get_id() == 'gcc' and cc.version().version_compare('< 4.8') error('Altivec is not supported with gcc version < 4.8.') endif @@ -650,6 +652,7 @@ if get_option('power8') != 'false' endif _opencl = get_option('gallium-opencl') +clover_cpp_std = [] if _opencl != 'disabled' if not with_gallium error('OpenCL Clover implementation requires at least one gallium driver.') @@ -658,10 +661,18 @@ if _opencl != 'disabled' dep_clc = dependency('libclc') with_gallium_opencl = true with_opencl_icd = _opencl == 'icd' + + if host_machine.cpu_family().startswith('ppc') and cpp.compiles(''' + #if !defined(__VEC__) || !defined(__ALTIVEC__) + #error "AltiVec not enabled" + #endif''', + name : 'Altivec') + clover_cpp_std += ['cpp_std=gnu++11'] + endif else dep_clc = null_dep with_gallium_opencl = false - with_gallium_icd = false + with_opencl_icd = false endif gl_pkgconfig_c_flags = [] @@ -781,7 +792,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', endif # TODO: this is very incomplete -if ['linux', 'cygwin'].contains(host_machine.system()) +if ['linux', 'cygwin', 'gnu'].contains(host_machine.system()) pre_args += '-D_GNU_SOURCE' endif @@ -918,7 +929,7 @@ endif # case of cross compiling where we can use asm, and that's x86_64 -> x86 when # host OS == build OS, since in that case the build machine can run the host's # binaries. -if meson.is_cross_build() +if with_asm and meson.is_cross_build() if build_machine.system() != host_machine.system() # TODO: It may be possible to do this with an exe_wrapper (like wine). message('Cross compiling from one OS to another, disabling assembly.') @@ -940,7 +951,7 @@ endif with_asm_arch = '' if with_asm if host_machine.cpu_family() == 'x86' - if system_has_kms_drm + if system_has_kms_drm or host_machine.system() == 'gnu' with_asm_arch = 'x86' pre_args += ['-DUSE_X86_ASM', '-DUSE_MMX_ASM', '-DUSE_3DNOW_ASM', '-DUSE_SSE_ASM'] @@ -969,7 +980,7 @@ if with_asm with_asm_arch = 'sparc' pre_args += ['-DUSE_SPARC_ASM'] endif - elif host_machine.cpu_family() == 'ppc64le' + elif host_machine.cpu_family().startswith('ppc64') and host_machine.endian() == 'little' if system_has_kms_drm with_asm_arch = 'ppc64le' pre_args += ['-DUSE_PPC64LE_ASM'] @@ -1102,7 +1113,7 @@ dep_libdrm_nouveau = null_dep dep_libdrm_etnaviv = null_dep dep_libdrm_intel = null_dep -_drm_amdgpu_ver = '2.4.95' +_drm_amdgpu_ver = '2.4.97' _drm_radeon_ver = '2.4.71' _drm_nouveau_ver = '2.4.66' _drm_etnaviv_ver = '2.4.89' @@ -1163,7 +1174,7 @@ endif llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit'] llvm_optional_modules = [] if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 - llvm_modules += ['amdgpu', 'bitreader', 'ipo'] + llvm_modules += ['amdgpu', 'native', 'bitreader', 'ipo'] if with_gallium_r600 llvm_modules += 'asmparser' endif @@ -1177,7 +1188,7 @@ if with_gallium_opencl endif if with_amd_vk or with_gallium_radeonsi - _llvm_version = '>= 6.0.0' + _llvm_version = '>= 7.0.0' elif with_gallium_swr _llvm_version = '>= 6.0.0' elif with_gallium_opencl or with_gallium_r600 @@ -1224,6 +1235,9 @@ if with_llvm # programs, so we need to build all C++ code in mesa without rtti as well to # ensure that linking works. if dep_llvm.get_configtool_variable('has-rtti') == 'NO' + if with_gallium_nouveau + error('The Nouveau driver requires rtti. You either need to turn off nouveau or use an LLVM built with LLVM_ENABLE_RTTI.') + endif cpp_args += '-fno-rtti' endif elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr @@ -1350,9 +1364,8 @@ if with_platform_x11 dep_xdamage = dependency('xdamage', version : '>= 1.1') dep_xfixes = dependency('xfixes') dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1') - dep_xxf86vm = dependency('xxf86vm', required : false) endif - if (with_any_vk or with_glx == 'dri' or + if (with_any_vk or with_glx == 'dri' or with_egl or (with_gallium_vdpau or with_gallium_xvmc or with_gallium_va or with_gallium_omx != 'disabled')) dep_xcb = dependency('xcb') @@ -1377,6 +1390,7 @@ if with_platform_x11 if with_glx == 'dri' if with_dri_platform == 'drm' dep_dri2proto = dependency('dri2proto', version : '>= 2.8') + dep_xxf86vm = dependency('xxf86vm') endif dep_glproto = dependency('glproto', version : '>= 1.4.14') endif @@ -1397,7 +1411,7 @@ endif _sensors = get_option('lmsensors') if _sensors != 'false' - dep_lmsensors = cc.find_library('libsensors', required : _sensors == 'true') + dep_lmsensors = cc.find_library('sensors', required : _sensors == 'true') if dep_lmsensors.found() pre_args += '-DHAVE_LIBSENSORS=1' endif @@ -1427,14 +1441,12 @@ elif with_glx == 'dri' 'xcb-glx >= 1.8.1'] if with_dri_platform == 'drm' gl_priv_reqs += 'xcb-dri2 >= 1.8' + gl_priv_reqs += 'xxf86vm' endif endif if dep_libdrm.found() gl_priv_reqs += 'libdrm >= 2.4.75' endif -if dep_xxf86vm.found() - gl_priv_reqs += 'xxf86vm' -endif gl_priv_libs = [] if dep_thread.found()