X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=5b4883133098d6a41de76c67d1167c4e5d8423f9;hb=b7393f1115f5cc240f4ba389c56d50606143854a;hp=2d8668e601b596233b598ac1bec0312e0dc03fb7;hpb=b962c7c9713700ca02b698efb1dfdd28516ce580;p=mesa.git diff --git a/meson.build b/meson.build index 2d8668e601b..5b488313309 100644 --- a/meson.build +++ b/meson.build @@ -53,6 +53,7 @@ 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_vulkan_overlay_layer = get_option('vulkan-overlay-layer') with_tools = get_option('tools') if with_tools.contains('all') with_tools = [ @@ -69,6 +70,9 @@ if with_tools.contains('all') ] endif +with_intel_tools = with_tools.contains('intel') or with_tools.contains('intel-ui') +with_imgui = with_intel_tools or with_vulkan_overlay_layer + dri_drivers_path = get_option('dri-drivers-path') if dri_drivers_path == '' dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri') @@ -162,7 +166,8 @@ if gallium_drivers.contains('auto') # TODO: PPC, Sparc if ['x86', 'x86_64'].contains(host_machine.cpu_family()) gallium_drivers = [ - 'r300', 'r600', 'radeonsi', 'nouveau', 'virgl', 'svga', 'swrast' + 'r300', 'r600', 'radeonsi', 'nouveau', 'virgl', 'svga', 'swrast', + 'iris' ] elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) gallium_drivers = [ @@ -198,13 +203,10 @@ with_gallium_svga = gallium_drivers.contains('svga') with_gallium_virgl = gallium_drivers.contains('virgl') with_gallium_swr = gallium_drivers.contains('swr') with_gallium_lima = gallium_drivers.contains('lima') +with_gallium_zink = gallium_drivers.contains('zink') -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 +if cc.get_id().startswith('intel') and meson.version().version_compare('< 0.49.1') + error('Meson does not have sufficient support of ICC before 0.49.1 to compile mesa') endif with_gallium = gallium_drivers.length() != 0 and gallium_drivers != [''] @@ -495,6 +497,10 @@ if vdpau_drivers_path == '' vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau') endif +if with_gallium_zink + dep_vulkan = dependency('vulkan') +endif + _xvmc = get_option('gallium-xvmc') if not system_has_kms_drm if _xvmc == 'true' @@ -883,7 +889,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', endif # TODO: this is very incomplete -if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) +if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd'].contains(host_machine.system()) pre_args += '-D_GNU_SOURCE' elif host_machine.system() == 'sunos' pre_args += '-D__EXTENSIONS__' @@ -943,6 +949,7 @@ else '-Werror=implicit-function-declaration', '-Werror=missing-prototypes', '-Werror=return-type', + '-Werror=empty-body', '-Werror=incompatible-pointer-types', '-Wno-missing-field-initializers', '-Wno-format-truncation', @@ -962,6 +969,7 @@ else _trial = [ '-Werror=return-type', + '-Werror=empty-body', '-Wno-non-virtual-dtor', '-Wno-missing-field-initializers', '-Wno-format-truncation', @@ -989,10 +997,10 @@ else c_vis_args += '-fvisibility=hidden' endif - # Check for C and C++ arguments for MSVC2013 compatibility. These are only - # used in parts of the mesa code base that need to compile with old versions - # of MSVC, mainly common code - foreach a : ['-Werror=pointer-arith', '-Werror=vla'] + # Check for C and C++ arguments for MSVC compatibility. These are only used + # in parts of the mesa code base that need to compile with MSVC, mainly + # common code + foreach a : ['-Werror=pointer-arith', '-Werror=vla', '-Werror=gnu-empty-initializer'] if cc.has_argument(a) c_msvc_compat_args += a endif @@ -1146,7 +1154,7 @@ foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h' endif endforeach -foreach f : ['strtof', 'mkostemp', 'timespec_get', 'memfd_create', 'random_r', 'flock'] +foreach f : ['strtof', 'mkostemp', 'timespec_get', 'memfd_create', 'random_r', 'flock', 'strtok_r'] if cc.has_function(f) pre_args += '-DHAVE_@0@'.format(f.to_upper()) endif @@ -1220,14 +1228,12 @@ ld_args_build_id = cc.get_supported_link_arguments('-Wl,--build-id=sha1') # check for dl support dep_dl = null_dep -if host_machine.system() != 'windows' - if not cc.has_function('dlopen') - dep_dl = cc.find_library('dl') - endif - if cc.has_function('dladdr', dependencies : dep_dl) - # This is really only required for megadrivers - pre_args += '-DHAVE_DLADDR' - endif +if not cc.has_function('dlopen') + dep_dl = cc.find_library('dl', required : host_machine.system() != 'windows') +endif +if cc.has_function('dladdr', dependencies : dep_dl) + # This is really only required for megadrivers + pre_args += '-DHAVE_DLADDR' endif if cc.has_function('dl_iterate_phdr') @@ -1248,6 +1254,17 @@ endif # TODO: some of these may be conditional dep_zlib = dependency('zlib', version : '>= 1.2.3', fallback : ['zlib', 'zlib_dep']) pre_args += '-DHAVE_ZLIB' + +_zstd = get_option('zstd') +if _zstd != 'false' + dep_zstd = dependency('libzstd', required : _zstd == 'true') + if dep_zstd.found() + pre_args += '-DHAVE_ZSTD' + endif +else + dep_zstd = null_dep +endif + dep_thread = dependency('threads') if dep_thread.found() and host_machine.system() != 'windows' pre_args += '-DHAVE_PTHREAD' @@ -1283,7 +1300,7 @@ dep_libdrm_radeon = null_dep dep_libdrm_nouveau = null_dep dep_libdrm_intel = null_dep -_drm_amdgpu_ver = '2.4.99' +_drm_amdgpu_ver = '2.4.100' _drm_radeon_ver = '2.4.71' _drm_nouveau_ver = '2.4.66' _drm_intel_ver = '2.4.75' @@ -1344,7 +1361,7 @@ if dep_libdrm.found() endif endif -llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit'] +llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit', 'core', 'executionengine', 'scalaropts', 'transformutils', 'instcombine'] llvm_optional_modules = ['coroutines'] if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 llvm_modules += ['amdgpu', 'native', 'bitreader', 'ipo'] @@ -1368,8 +1385,16 @@ else endif _shared_llvm = get_option('shared-llvm') - _llvm = get_option('llvm') + +# The cmake method will never find libllvm.so|dylib; this is fine for windows +# because llvm doesn't support libllvm.dll +_llvm_method = 'config-tool' +if (meson.version().version_compare('>= 0.51.0') and + host_machine.system() == 'windows') + _llvm_method = 'cmake' +endif + dep_llvm = null_dep with_llvm = false if _llvm != 'false' @@ -1383,7 +1408,7 @@ if _llvm != 'false' with_gallium_opencl or _llvm == 'true' ), static : not _shared_llvm, - method : 'config-tool', + method : _llvm_method, fallback : ['llvm', 'dep_llvm'], ) with_llvm = dep_llvm.found() @@ -1436,12 +1461,8 @@ else endif dep_glvnd = null_dep -glvnd_has_headers_and_pc_files = false if with_glvnd - dep_glvnd = dependency('libglvnd', version : '>= 0.2.0') - # GLVND before 1.2 was missing its pkg-config and header files, forcing every - # vendor to provide them and the distro maintainers to resolve the conflict. - glvnd_has_headers_and_pc_files = dep_glvnd.version().version_compare('>= 1.2.0') + dep_glvnd = dependency('libglvnd', version : '>= 1.2.0') pre_args += '-DUSE_LIBGLVND=1' endif @@ -1673,7 +1694,15 @@ endif pkg = import('pkgconfig') -prog_nm = find_program('nm', required : false) +if host_machine.system() == 'windows' + prog_dumpbin = find_program('dumpbin', required : false) + with_symbols_check = prog_dumpbin.found() and with_tests + symbols_check_args = ['--dumpbin', prog_dumpbin.path()] +else + prog_nm = find_program('nm') + with_symbols_check = with_tests + symbols_check_args = ['--nm', prog_nm.path()] +endif # This quirk needs to be applied to sources with functions defined in assembly # as GCC LTO drops them. See: https://bugs.freedesktop.org/show_bug.cgi?id=109391