X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=3dc1271f2ac2a74ecaa0dbe2e23d2f6e9026822d;hb=68201ab2dae3fc8550e013ace110b77c2d1b94a9;hp=b61c285bf00c3f1865881a6bc73a4fbd9e53f13e;hpb=80bc41b2ec7cf06662e16cbbb610c40a552d66a3;p=mesa.git diff --git a/meson.build b/meson.build index b61c285bf00..3dc1271f2ac 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2018 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 @@ -29,6 +29,8 @@ project( default_options : ['buildtype=debugoptimized', 'c_std=c99', 'cpp_std=c++11'] ) +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++. @@ -48,6 +50,10 @@ with_libunwind = get_option('libunwind') with_asm = get_option('asm') with_osmesa = get_option('osmesa') with_swr_arches = get_option('swr-arches').split(',') +with_tools = get_option('tools').split(',') +if with_tools.contains('all') + with_tools = ['freedreno', 'glsl', 'intel', 'nir', 'nouveau'] +endif if get_option('texture-float') pre_args += '-DTEXTURE_FLOAT_ENABLED' message('WARNING: Floating-point texture enabled. Please consult docs/patents.txt and your lawyer before building mesa.') @@ -99,7 +105,7 @@ if _drivers == 'auto' else error('Unknown architecture. Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.') endif - elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system()) + 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 @@ -144,7 +150,7 @@ if _drivers == 'auto' else error('Unknown architecture. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.') endif - elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system()) + 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.') @@ -168,6 +174,13 @@ if _drivers != '' with_gallium_virgl = _split.contains('virgl') with_gallium_swr = _split.contains('swr') with_gallium = true + if system_has_kms_drm + _glx = get_option('glx') + _egl = get_option('egl') + if _glx == 'dri' or _egl == 'true' or (_glx == 'disabled' and _egl != 'false') + with_dri = true + endif + endif endif with_intel_vk = false @@ -181,7 +194,7 @@ if _vulkan_drivers == 'auto' else error('Unknown architecture. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.') endif - elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system()) + elif ['darwin', 'windows', 'cygwin', 'haiku'].contains(host_machine.system()) # No vulkan driver supports windows or macOS currently _vulkan_drivers = '' else @@ -213,8 +226,6 @@ if with_dri_i915 or with_gallium_i915 dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75') endif -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) - if host_machine.system() == 'darwin' with_dri_platform = 'apple' elif ['windows', 'cygwin'].contains(host_machine.system()) @@ -242,6 +253,8 @@ if _platforms == 'auto' _platforms = 'x11,wayland,drm,surfaceless' elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system()) _platforms = 'x11,surfaceless' + elif ['haiku'].contains(host_machine.system()) + _platforms = 'haiku' else error('Unknown OS. Please pass -Dplatforms to set platforms. Patches gladly accepted to fix this.') endif @@ -252,6 +265,7 @@ if _platforms != '' with_platform_x11 = _split.contains('x11') with_platform_wayland = _split.contains('wayland') with_platform_drm = _split.contains('drm') + with_platform_haiku = _split.contains('haiku') with_platform_surfaceless = _split.contains('surfaceless') egl_native_platform = _split[0] endif @@ -260,9 +274,12 @@ with_glx = get_option('glx') if with_glx == 'auto' if with_dri with_glx = 'dri' + elif with_platform_haiku + with_glx = 'disabled' 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 @@ -271,11 +288,6 @@ 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 @@ -285,16 +297,14 @@ if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-x with_shared_glapi = false endif -with_gbm = get_option('gbm') -if with_gbm == 'auto' and with_dri # TODO: or gallium - with_gbm = system_has_kms_drm -elif with_gbm == 'true' - if not system_has_kms_drm - error('GBM only supports DRM/KMS platforms') - endif - with_gbm = true +_gbm = get_option('gbm') +if _gbm == 'auto' + with_gbm = system_has_kms_drm and with_dri else - with_gbm = false + with_gbm = _gbm == 'true' +endif +if with_gbm and not system_has_kms_drm + error('GBM only supports DRM/KMS platforms') endif _egl = get_option('egl') @@ -307,6 +317,8 @@ elif _egl == 'true' error('EGL requires shared-glapi') elif egl_native_platform == '' error('No platforms specified, consider -Dplatforms=drm,x11 at least') + elif not ['disabled', 'dri'].contains(with_glx) + error('EGL requires dri, but a GLX is being built without dri') endif with_egl = true else @@ -364,18 +376,18 @@ if with_vulkan_icd_dir == '' endif with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm' -with_dri3 = get_option('dri3') -if with_dri3 == 'auto' +_dri3 = get_option('dri3') +if _dri3 == 'auto' with_dri3 = system_has_kms_drm and with_dri2 else - with_dri3 = with_dri3 == 'true' + with_dri3 = _dri3 == 'true' 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 + 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') endif endif @@ -448,9 +460,6 @@ with_gallium_xvmc = _xvmc == 'true' dep_xvmc = [] if with_gallium_xvmc dep_xvmc = dependency('xvmc', version : '>= 1.0.6') - dep_xvmc = declare_dependency( - compile_args : run_command(prog_pkgconfig, ['xvmc', '--cflags']).stdout().split() - ) endif xvmc_drivers_path = get_option('xvmc-libs-path') @@ -460,34 +469,63 @@ endif _omx = get_option('gallium-omx') if not system_has_kms_drm - if _omx == 'true' - error('OMX state tracker can only be built on unix-like OSes.') + if ['auto', 'disabled'].contains(_omx) + _omx = 'disabled' else - _omx = 'false' + error('OMX state tracker can only be built on unix-like OSes.') endif elif not (with_platform_x11 or with_platform_drm) - if _omx == 'true' - error('OMX state tracker requires X11 or drm platform support.') + if ['auto', 'disabled'].contains(_omx) + _omx = 'disabled' else - _omx = 'false' + error('OMX state tracker requires X11 or drm platform support.') endif elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) - if _omx == 'true' - error('OMX state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau.') + if ['auto', 'disabled'].contains(_omx) + _omx = 'disabled' else - _omx = 'false' + error('OMX state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau.') endif -elif _omx == 'auto' - _omx = 'true' endif -with_gallium_omx = _omx == 'true' +with_gallium_omx = _omx dep_omx = [] -if with_gallium_omx - dep_omx = dependency('libomxil-bellagio') +dep_omx_other = [] +if with_gallium_omx == 'bellagio' or with_gallium_omx == 'auto' + dep_omx = dependency( + 'libomxil-bellagio', required : with_gallium_omx == 'bellagio' + ) + if dep_omx.found() + pre_args += '-DENABLE_ST_OMX_BELLAGIO' + with_gallium_omx = 'bellagio' + endif +endif +if with_gallium_omx == 'tizonia' or with_gallium_omx == 'auto' + if not (with_dri and with_egl) + if with_gallium_omx == 'tizonia' + error('OMX-Tizonia state tracker requires dri and egl') + else + with_gallium_omx == 'disabled' + endif + else + dep_omx = dependency( + 'libtizonia', version : '>= 0.10.0', + required : with_gallium_omx == 'tizonia', + ) + dep_omx_other = [ + dependency('libtizplatform', required : with_gallium_omx == 'tizonia'), + dependency('tizilheaders', required : with_gallium_omx == 'tizonia'), + ] + if dep_omx.found() and dep_omx_other[0].found() and dep_omx_other[1].found() + pre_args += '-DENABLE_ST_OMX_TIZONIA' + with_gallium_omx = 'tizonia' + else + with_gallium_omx = 'disabled' + endif + endif endif omx_drivers_path = get_option('omx-libs-path') -if with_gallium_omx +if with_gallium_omx != 'disabled' # Figure out where to put the omx driver. # FIXME: this could all be vastly simplified by adding a 'defined_variable' # argument to meson's get_pkgconfig_variable method. @@ -510,11 +548,6 @@ if with_gallium_omx endif endif endif -if with_gallium_omx - dep_omx = declare_dependency( - compile_args : run_command(prog_pkgconfig, ['libomxil-bellagio', '--cflags']).stdout().split() - ) -endif _va = get_option('gallium-va') if not system_has_kms_drm @@ -542,7 +575,7 @@ with_gallium_va = _va == 'true' dep_va = [] if with_gallium_va dep_va = dependency('libva', version : '>= 0.38.0') - dep_va = declare_dependency( + dep_va_headers = declare_dependency( compile_args : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().split() ) endif @@ -605,7 +638,7 @@ endif gl_pkgconfig_c_flags = [] if with_platform_x11 - if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') + if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm') pre_args += '-DHAVE_X11_PLATFORM' endif if with_glx == 'xlib' or with_glx == 'gallium-xlib' @@ -644,6 +677,9 @@ if with_platform_android ] pre_args += '-DHAVE_ANDROID_PLATFORM' endif +if with_platform_haiku + pre_args += '-DHAVE_HAIKU_PLATFORM' +endif prog_python2 = find_program('python2') has_mako = run_command(prog_python2, '-c', 'import mako') @@ -788,9 +824,26 @@ else endif # Check for GCC style atomics +dep_atomic = declare_dependency() + if cc.compiles('int main() { int n; return __atomic_load_n(&n, __ATOMIC_ACQUIRE); }', name : 'GCC atomic builtins') pre_args += '-DUSE_GCC_ATOMIC_BUILTINS' + + # Not all atomic calls can be turned into lock-free instructions, in which + # GCC will make calls into the libatomic library. Check whether we need to + # link with -latomic. + # + # This can happen for 64-bit atomic operations on 32-bit architectures such + # as ARM. + if not cc.links('''#include + int main() { + uint64_t n; + return (int)__atomic_load_n(&n, __ATOMIC_ACQUIRE); + }''', + name : 'GCC atomic builtins required -latomic') + dep_atomic = cc.find_library('atomic') + endif endif if not cc.links('''#include uint64_t v; @@ -976,7 +1029,7 @@ dep_libdrm_nouveau = [] dep_libdrm_etnaviv = [] dep_libdrm_freedreno = [] if with_amd_vk or with_gallium_radeonsi - dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.89') + dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.90') endif if (with_gallium_radeonsi or with_dri_r100 or with_dri_r200 or with_gallium_r300 or with_gallium_r600) @@ -989,7 +1042,7 @@ if with_gallium_etnaviv dep_libdrm_etnaviv = dependency('libdrm_etnaviv', version : '>= 2.4.82') endif if with_gallium_freedreno - dep_libdrm_freedreno = dependency('libdrm_freedreno', version : '>= 2.4.89') + dep_libdrm_freedreno = dependency('libdrm_freedreno', version : '>= 2.4.91') endif llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit'] @@ -1007,9 +1060,9 @@ if with_gallium_opencl # TODO: optional modules endif -if with_amd_vk or with_gallium_radeonsi +if with_amd_vk or with_gallium_radeonsi or with_gallium_swr _llvm_version = '>= 4.0.0' -elif with_gallium_opencl or with_gallium_swr or with_gallium_r600 +elif with_gallium_opencl or with_gallium_r600 _llvm_version = '>= 3.9.0' else _llvm_version = '>= 3.3.0' @@ -1035,7 +1088,14 @@ if with_llvm # 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. - _llvm_patch = _llvm_version[2] + + # 3 digits versions in LLVM only started from 3.4.1 on + if dep_llvm.version().version_compare('>= 3.4.1') + _llvm_patch = _llvm_version[2] + else + _llvm_patch = '0' + endif + if _llvm_patch.endswith('svn') _llvm_patch = _llvm_patch.split('s')[0] elif _llvm_patch.contains('git') @@ -1159,12 +1219,12 @@ if with_platform_x11 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_omx or - with_gallium_xa)) + (with_gallium_vdpau or with_gallium_xvmc or with_gallium_va or + with_gallium_omx != 'disabled')) dep_xcb = dependency('xcb') dep_x11_xcb = dependency('x11-xcb') endif - if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') + if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm') dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8') if with_dri3 @@ -1181,7 +1241,9 @@ if with_platform_x11 endif dep_glproto = dependency('glproto', version : '>= 1.4.14') endif - if with_egl + if (with_egl or ( + with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or + with_gallium_omx != 'disabled')) dep_xcb_xfixes = dependency('xcb-xfixes') endif endif @@ -1252,6 +1314,9 @@ endif pkg = import('pkgconfig') +env_test = environment() +env_test.set('NM', find_program('nm').path()) + subdir('include') subdir('bin') subdir('src')