X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=709f77a9c7a0924b10671cd95340258733210536;hb=b56d903b5abe7bf0157f99d707a9114b03231632;hp=636d0f913ac6d2dc9ecb598842093fcfe2b91d40;hpb=a5abb2da74d3a892427499961aaef194d9ce1edf;p=mesa.git diff --git a/meson.build b/meson.build index 636d0f913ac..709f77a9c7a 100644 --- a/meson.build +++ b/meson.build @@ -25,13 +25,14 @@ project( [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py'] ).stdout(), license : 'MIT', - meson_version : '>= 0.44.1', - default_options : ['buildtype=debugoptimized', 'c_std=c99', 'cpp_std=c++11'] + meson_version : '>= 0.45', + default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11'] ) -null_dep = dependency('', required : false) +cc = meson.get_compiler('c') +cpp = meson.get_compiler('cpp') -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) +null_dep = dependency('', required : false) # 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 @@ -40,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"', ] @@ -51,15 +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'] -endif -if get_option('texture-float') - pre_args += '-DTEXTURE_FLOAT_ENABLED' - warning('Floating-point texture enabled. Please consult docs/patents.txt and your lawyer before building mesa.') + with_tools = ['etnaviv', 'freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc'] endif dri_drivers_path = get_option('dri-drivers-path') @@ -103,13 +100,15 @@ if _drivers.contains('auto') elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) _drivers = [] else - error('Unknown architecture. Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.') + error('Unknown architecture @0@. Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.'.format( + host_machine.cpu_family())) endif elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system()) # only swrast would make sense here, but gallium swrast is a much better default _drivers = [] else - error('Unknown OS. Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.') + error('Unknown OS @0@. Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.'.format( + host_machine.system())) endif endif @@ -136,12 +135,14 @@ if _drivers.contains('auto') 'tegra', 'virgl', 'swrast', ] else - error('Unknown architecture. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.') + error('Unknown architecture @0@. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.'.format( + host_machine.cpu_family())) endif elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system()) _drivers = ['swrast'] else - error('Unknown OS. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.') + error('Unknown OS @0@. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.'.format( + host_machine.system())) endif endif with_gallium_pl111 = _drivers.contains('pl111') @@ -176,14 +177,18 @@ if _vulkan_drivers.contains('auto') if system_has_kms_drm if host_machine.cpu_family().startswith('x86') _vulkan_drivers = ['amd', 'intel'] + elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) + _vulkan_drivers = [] else - error('Unknown architecture. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.') + error('Unknown architecture @0@. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.'.format( + host_machine.cpu_family())) endif elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system()) # No vulkan driver supports windows or macOS currently _vulkan_drivers = [] else - error('Unknown OS. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.') + error('Unknown OS @0@. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.'.format( + host_machine.system())) endif endif @@ -216,8 +221,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 @@ -231,7 +234,8 @@ if _platforms.contains('auto') elif ['haiku'].contains(host_machine.system()) _platforms = ['haiku'] else - error('Unknown OS. Please pass -Dplatforms to set platforms. Patches gladly accepted to fix this.') + error('Unknown OS @0@. Please pass -Dplatforms to set platforms. Patches gladly accepted to fix this.'.format( + host_machine.system())) endif endif @@ -248,6 +252,13 @@ if _platforms.length() != 0 and _platforms != [''] egl_native_platform = _platforms[0] endif +_xlib_lease = get_option('xlib-lease') +if _xlib_lease == 'auto' + with_xlib_lease = with_platform_x11 and with_platform_drm +else + with_xlib_lease = _xlib_lease == 'true' +endif + with_glx = get_option('glx') if with_glx == 'auto' if with_dri @@ -257,7 +268,6 @@ if with_glx == 'auto' elif with_gallium # Even when building just gallium drivers the user probably wants dri with_glx = 'dri' - with_dri = true elif with_platform_x11 and with_any_opengl and not with_any_vk # The automatic behavior should not be to turn on xlib based glx when # building only vulkan drivers @@ -266,6 +276,11 @@ if with_glx == 'auto' with_glx = 'disabled' endif endif +if with_glx == 'dri' + if with_gallium + with_dri = true + endif +endif if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib') with_gles1 = false @@ -287,16 +302,21 @@ endif _egl = get_option('egl') if _egl == 'auto' - with_egl = with_dri and with_shared_glapi and with_platforms + with_egl = ( + not ['darwin', 'windows'].contains(host_machine.system()) and + with_dri and with_shared_glapi and with_platforms + ) elif _egl == 'true' if not with_dri error('EGL requires dri') elif not with_shared_glapi error('EGL requires shared-glapi') elif not with_platforms - error('No platforms specified, consider -Dplatforms=drm,x11 at least') + error('No platforms specified, consider -Dplatforms=drm,x11,surfaceless at least') elif not ['disabled', 'dri'].contains(with_glx) error('EGL requires dri, but a GLX is being built without dri') + elif ['darwin', 'windows'].contains(host_machine.system()) + error('EGL is not available on Windows or MacOS') endif with_egl = true else @@ -346,9 +366,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 @@ -364,9 +381,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 + error('building dri drivers require at least one windowing system') endif endif @@ -392,16 +409,17 @@ elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or else _vdpau = 'false' endif -elif _vdpau == 'auto' - _vdpau = 'true' endif -with_gallium_vdpau = _vdpau == 'true' dep_vdpau = null_dep -if with_gallium_vdpau - dep_vdpau = dependency('vdpau', version : '>= 1.1') - dep_vdpau = declare_dependency( - compile_args : run_command(prog_pkgconfig, ['vdpau', '--cflags']).stdout().split() - ) +with_gallium_vdpau = false +if _vdpau != 'false' + dep_vdpau = dependency('vdpau', version : '>= 1.1', required : _vdpau == 'true') + if dep_vdpau.found() + dep_vdpau = declare_dependency( + compile_args : run_command(prog_pkgconfig, ['vdpau', '--cflags']).stdout().split() + ) + with_gallium_vdpau = true + endif endif if with_gallium_vdpau @@ -431,13 +449,12 @@ elif not (with_gallium_r600 or with_gallium_nouveau) else _xvmc = 'false' endif -elif _xvmc == 'auto' - _xvmc = 'true' endif -with_gallium_xvmc = _xvmc == 'true' dep_xvmc = null_dep -if with_gallium_xvmc - dep_xvmc = dependency('xvmc', version : '>= 1.0.6') +with_gallium_xvmc = false +if _xvmc != 'false' + dep_xvmc = dependency('xvmc', version : '>= 1.0.6', required : _xvmc == 'true') + with_gallium_xvmc = dep_xvmc.found() endif xvmc_drivers_path = get_option('xvmc-libs-path') @@ -550,16 +567,17 @@ elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) else _va = 'false' endif -elif _va == 'auto' - _va = 'true' endif -with_gallium_va = _va == 'true' +with_gallium_va = false dep_va = null_dep -if with_gallium_va - dep_va = dependency('libva', version : '>= 0.39.0') - dep_va_headers = declare_dependency( - compile_args : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().split() - ) +if _va != 'false' + dep_va = dependency('libva', version : '>= 0.38.0', required : _va == 'true') + if dep_va.found() + dep_va_headers = declare_dependency( + compile_args : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().split() + ) + with_gallium_va = true + endif endif va_drivers_path = get_option('va-libs-path') @@ -595,23 +613,58 @@ 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') endif endif +if get_option('power8') != 'false' + # 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 + if cc.compiles(''' + #include + int main() { + vector unsigned char r; + vector unsigned int v = vec_splat_u32 (1); + r = __builtin_vec_vgbbd ((vector unsigned char) v); + return 0; + }''', + args : '-mpower8-vector', + name : 'POWER8 intrinsics') + pre_args += ['-D_ARCH_PWR8', '-mpower8-vector'] + elif get_option('power8') == 'true' + error('POWER8 intrinsic support required but not found.') + endif + endif +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.') endif - # TODO: alitvec? 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 @@ -663,13 +716,18 @@ if with_platform_haiku pre_args += '-DHAVE_HAIKU_PLATFORM' endif -prog_python2 = find_program('python2') -has_mako = run_command(prog_python2, '-c', 'import mako') +prog_python = import('python3').find_python() +has_mako = run_command( + prog_python, '-c', + ''' +from distutils.version import StrictVersion +import mako +assert StrictVersion(mako.__version__) > StrictVersion("0.8.0") + ''') if has_mako.returncode() != 0 - error('Python (2.x) mako module required to build mesa.') + error('Python (3.x) mako module >= 0.8.0 required to build mesa.') endif -cc = meson.get_compiler('c') if cc.get_id() == 'gcc' and cc.version().version_compare('< 4.4.6') error('When using GCC, version 4.4.6 or later is required.') endif @@ -730,28 +788,36 @@ 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 # Check for generic C arguments c_args = [] -foreach a : ['-Wall', '-Werror=implicit-function-declaration', - '-Werror=missing-prototypes', '-fno-math-errno', +foreach a : ['-Werror=implicit-function-declaration', + '-Werror=missing-prototypes', '-Werror=return-type', + '-fno-math-errno', '-fno-trapping-math', '-Qunused-arguments'] if cc.has_argument(a) c_args += a endif endforeach + +foreach a : ['missing-field-initializers', 'format-truncation'] + if cc.has_argument('-W' + a) + c_args += '-Wno-' + a + endif +endforeach + c_vis_args = [] if cc.has_argument('-fvisibility=hidden') c_vis_args += '-fvisibility=hidden' endif # Check for generic C++ arguments -cpp = meson.get_compiler('cpp') cpp_args = [] -foreach a : ['-Wall', '-fno-math-errno', '-fno-trapping-math', +foreach a : ['-Werror=return-type', + '-fno-math-errno', '-fno-trapping-math', '-Qunused-arguments'] if cpp.has_argument(a) cpp_args += a @@ -760,9 +826,12 @@ endforeach # For some reason, the test for -Wno-foo always succeeds with gcc, even if the # option is not supported. Hence, check for -Wfoo instead. -if cpp.has_argument('-Wnon-virtual-dtor') - cpp_args += '-Wno-non-virtual-dtor' -endif + +foreach a : ['non-virtual-dtor', 'missing-field-initializers', 'format-truncation'] + if cpp.has_argument('-W' + a) + cpp_args += '-Wno-' + a + endif +endforeach no_override_init_args = [] foreach a : ['override-init', 'initializer-overrides'] @@ -808,7 +877,15 @@ endif # Check for GCC style atomics dep_atomic = null_dep -if cc.compiles('int main() { int n; return __atomic_load_n(&n, __ATOMIC_ACQUIRE); }', +if cc.compiles('''#include + int main() { + struct { + uint64_t *v; + } x; + return (int)__atomic_load_n(x.v, __ATOMIC_ACQUIRE) & + (int)__atomic_add_fetch(x.v, (uint64_t)1, __ATOMIC_ACQ_REL); + + }''', name : 'GCC atomic builtins') pre_args += '-DUSE_GCC_ATOMIC_BUILTINS' @@ -823,7 +900,8 @@ if cc.compiles('int main() { int n; return __atomic_load_n(&n, __ATOMIC_ACQUIRE) struct { uint64_t *v; } x; - return (int)__atomic_load_n(x.v, __ATOMIC_ACQUIRE); + return (int)__atomic_load_n(x.v, __ATOMIC_ACQUIRE) & + (int)__atomic_add_fetch(x.v, (uint64_t)1, __ATOMIC_ACQ_REL); }''', name : 'GCC atomic builtins required -latomic') dep_atomic = cc.find_library('atomic') @@ -834,12 +912,11 @@ if not cc.links('''#include int main() { return __sync_add_and_fetch(&v, (uint64_t)1); }''', + dependencies : dep_atomic, name : 'GCC 64bit atomics') - pre_args += '-DMISSING_64_BIT_ATOMICS' + pre_args += '-DMISSING_64BIT_ATOMICS' endif -# TODO: endian -# TODO: powr8 # TODO: shared/static? Is this even worth doing? # When cross compiling we generally need to turn off the use of assembly, @@ -848,7 +925,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.') @@ -869,9 +946,8 @@ endif with_asm_arch = '' if with_asm - # TODO: SPARC and PPC 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'] @@ -895,6 +971,16 @@ if with_asm with_asm_arch = 'aarch64' pre_args += ['-DUSE_AARCH64_ASM'] endif + elif host_machine.cpu_family() == 'sparc64' + if system_has_kms_drm + with_asm_arch = 'sparc' + pre_args += ['-DUSE_SPARC_ASM'] + endif + 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'] + endif endif endif @@ -905,7 +991,7 @@ elif cc.has_header_symbol('sys/mkdev.h', 'major') pre_args += '-DMAJOR_IN_MKDEV' endif -foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h'] +foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h'] if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h)) pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify()) endif @@ -934,7 +1020,7 @@ if cc.links(''' freelocale(loc); return 0; }''', - extra_args : pre_args, + args : pre_args, name : 'strtod has locale support') pre_args += '-DHAVE_STRTOD_L' endif @@ -1000,14 +1086,13 @@ pre_args += '-DHAVE_ZLIB' dep_thread = dependency('threads') if dep_thread.found() and host_machine.system() != 'windows' pre_args += '-DHAVE_PTHREAD' -endif -if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 or with_gallium_opencl - dep_elf = dependency('libelf', required : false) - if not dep_elf.found() - dep_elf = cc.find_library('elf') + if cc.has_function( + 'pthread_setaffinity_np', + dependencies : dep_thread, + prefix : '#include ', + args : '-D_GNU_SOURCE') + pre_args += '-DHAVE_PTHREAD_SETAFFINITY' endif -else - dep_elf = null_dep endif dep_expat = dependency('expat') # this only exists on linux so either this is linux and it will be found, or @@ -1022,14 +1107,12 @@ dep_libdrm_amdgpu = null_dep dep_libdrm_radeon = null_dep dep_libdrm_nouveau = null_dep dep_libdrm_etnaviv = null_dep -dep_libdrm_freedreno = null_dep dep_libdrm_intel = null_dep -_drm_amdgpu_ver = '2.4.91' +_drm_amdgpu_ver = '2.4.95' _drm_radeon_ver = '2.4.71' _drm_nouveau_ver = '2.4.66' _drm_etnaviv_ver = '2.4.89' -_drm_freedreno_ver = '2.4.92' _drm_intel_ver = '2.4.75' _drm_ver = '2.4.75' @@ -1040,7 +1123,6 @@ _libdrm_checks = [ with_gallium_r300 or with_gallium_r600)], ['nouveau', (with_gallium_nouveau or with_dri_nouveau)], ['etnaviv', with_gallium_etnaviv], - ['freedreno', with_gallium_freedreno], ] # VC4 only needs core libdrm support of this version, not a libdrm_vc4 @@ -1051,12 +1133,17 @@ endif # Loop over the enables versions and get the highest libdrm requirement for all # active drivers. +_drm_blame = '' foreach d : _libdrm_checks ver = get_variable('_drm_@0@_ver'.format(d[0])) if d[1] and ver.version_compare('>' + _drm_ver) _drm_ver = ver + _drm_blame = d[0] endif endforeach +if _drm_blame != '' + message('libdrm @0@ needed because @1@ has the highest requirement'.format(_drm_ver, _drm_blame)) +endif # Then get each libdrm module foreach d : _libdrm_checks @@ -1081,8 +1168,9 @@ if dep_libdrm.found() 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 @@ -1092,39 +1180,40 @@ if with_gallium_opencl 'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader', 'lto', 'option', 'objcarcopts', 'profiledata', ] - # TODO: optional modules + llvm_optional_modules += ['coroutines'] endif if with_amd_vk or with_gallium_radeonsi - _llvm_version = '>= 5.0.0' + _llvm_version = '>= 7.0.0' elif with_gallium_swr - _llvm_version = '>= 4.0.0' + _llvm_version = '>= 6.0.0' elif with_gallium_opencl or with_gallium_r600 _llvm_version = '>= 3.9.0' else _llvm_version = '>= 3.3.0' endif +_shared_llvm = get_option('shared-llvm') + _llvm = get_option('llvm') -if _llvm == 'auto' +dep_llvm = null_dep +with_llvm = false +if _llvm != 'false' dep_llvm = dependency( - 'llvm', version : _llvm_version, modules : llvm_modules, - required : with_amd_vk or with_gallium_radeonsi or with_gallium_swr or with_gallium_opencl, + 'llvm', + version : _llvm_version, + modules : llvm_modules, + optional_modules : llvm_optional_modules, + required : ( + with_amd_vk or with_gallium_radeonsi or with_gallium_swr or + with_gallium_opencl or _llvm == 'true' + ), + static : not _shared_llvm, ) with_llvm = dep_llvm.found() -elif _llvm == 'true' - dep_llvm = dependency('llvm', version : _llvm_version, modules : llvm_modules) - with_llvm = true -else - dep_llvm = null_dep - with_llvm = false endif if with_llvm _llvm_version = dep_llvm.version().split('.') - # Development versions of LLVM have an 'svn' or 'git' suffix, we don't want - # that for our version checks. - # svn suffixes are stripped by meson as of 0.43, and git suffixes are - # strippped as of 0.44, but we support older meson versions. # 3 digits versions in LLVM only started from 3.4.1 on if dep_llvm.version().version_compare('>= 3.4.1') @@ -1133,11 +1222,6 @@ if with_llvm _llvm_patch = '0' endif - if _llvm_patch.endswith('svn') - _llvm_patch = _llvm_patch.split('s')[0] - elif _llvm_patch.contains('git') - _llvm_patch = _llvm_patch.split('g')[0] - endif pre_args += [ '-DHAVE_LLVM=0x0@0@0@1@'.format(_llvm_version[0], _llvm_version[1]), '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch), @@ -1147,12 +1231,25 @@ 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 error('The following drivers require LLVM: Radv, RadeonSI, SWR. One of these is enabled, but LLVM is disabled.') endif +if (with_amd_vk or with_gallium_radeonsi or with_gallium_opencl or + (with_gallium_r600 and with_llvm)) + dep_elf = dependency('libelf', required : false) + if not dep_elf.found() + dep_elf = cc.find_library('elf') + endif +else + dep_elf = null_dep +endif + dep_glvnd = null_dep if with_glvnd dep_glvnd = dependency('libglvnd', version : '>= 0.2.0') @@ -1179,8 +1276,6 @@ if get_option('selinux') pre_args += '-DMESA_SELINUX' endif -# TODO: llvm-prefix and llvm-shared-libs - if with_libunwind != 'false' dep_unwind = dependency('libunwind', required : with_libunwind == 'true') if dep_unwind.found() @@ -1190,8 +1285,6 @@ else dep_unwind = null_dep endif -# TODO: gallium-hud - if with_osmesa != 'none' if with_osmesa == 'classic' and not with_dri_swrast error('OSMesa classic requires dri (classic) swrast.') @@ -1215,24 +1308,26 @@ endif # TODO: symbol mangling if with_platform_wayland - prog_wl_scanner = find_program('wayland-scanner') + dep_wl_scanner = dependency('wayland-scanner', native: true) + prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) + if dep_wl_scanner.version().version_compare('>= 1.15') + wl_scanner_arg = 'private-code' + else + wl_scanner_arg = 'code' + endif dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.8') dep_wayland_client = dependency('wayland-client', version : '>=1.11') dep_wayland_server = dependency('wayland-server', version : '>=1.11') if with_egl - dep_wayland_egl = dependency('wayland-egl', version : '>=1.15') + dep_wayland_egl = dependency('wayland-egl-backend', version : '>= 3') + dep_wayland_egl_headers = declare_dependency( + compile_args : run_command(prog_pkgconfig, ['wayland-egl-backend', '--cflags']).stdout().split()) endif wayland_dmabuf_xml = join_paths( dep_wl_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable', 'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml' ) pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED'] -else - prog_wl_scanner = [] - dep_wl_protocols = null_dep - dep_wayland_client = null_dep - dep_wayland_server = null_dep - wayland_dmabuf_xml = '' endif dep_x11 = null_dep @@ -1252,6 +1347,8 @@ dep_xcb_present = null_dep dep_xcb_sync = null_dep dep_xcb_xfixes = null_dep dep_xshmfence = null_dep +dep_xcb_xrandr = null_dep +dep_xlib_xrandr = null_dep if with_platform_x11 if with_glx == 'xlib' or with_glx == 'gallium-xlib' dep_x11 = dependency('x11') @@ -1263,7 +1360,6 @@ 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 (with_gallium_vdpau or with_gallium_xvmc or with_gallium_va or @@ -1290,6 +1386,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 @@ -1298,6 +1395,10 @@ if with_platform_x11 with_gallium_omx != 'disabled')) dep_xcb_xfixes = dependency('xcb-xfixes') endif + if with_xlib_lease + dep_xcb_xrandr = dependency('xcb-randr', version : '>= 1.12') + dep_xlib_xrandr = dependency('xrandr', version : '>= 1.3') + endif endif if get_option('gallium-extra-hud') @@ -1306,7 +1407,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 @@ -1314,10 +1415,6 @@ else dep_lmsensors = null_dep endif -# TODO: various libdirs - -# TODO: gallium driver dirs - foreach a : pre_args add_project_arguments(a, language : ['c', 'cpp']) endforeach @@ -1330,18 +1427,22 @@ endforeach inc_include = include_directories('include') -gl_priv_reqs = [ - 'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb', - 'xcb-glx >= 1.8.1'] +gl_priv_reqs = [] + +if with_glx == 'xlib' or with_glx == 'gallium-xlib' + gl_priv_reqs += ['x11', 'xext', 'xcb'] +elif with_glx == 'dri' + gl_priv_reqs += [ + 'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb', + '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 -if with_dri_platform == 'drm' - gl_priv_reqs += 'xcb-dri2 >= 1.8' -endif gl_priv_libs = [] if dep_thread.found()