X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=bf306605645cdeb75517e510919d6e9d9916d953;hb=013b65635f1db45650809d8d802436c1e9d009e3;hp=6657de4de620ce8332766ca29ff46f9a834c4f6f;hpb=3aee462781abc0bfcce207fb64f9199b43a57542;p=mesa.git diff --git a/meson.build b/meson.build index 6657de4de62..bf306605645 100644 --- a/meson.build +++ b/meson.build @@ -22,7 +22,7 @@ project( 'mesa', ['c', 'cpp'], version : run_command( - [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py'] + [find_program('python', 'python3'), 'bin/meson_get_version.py'] ).stdout(), license : 'MIT', meson_version : '>= 0.46', @@ -34,6 +34,10 @@ cpp = meson.get_compiler('cpp') null_dep = dependency('', required : false) +if get_option('layout') != 'mirror' + error('`mirror` is the only build directory layout supported') +endif + # 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++. @@ -53,6 +57,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 +74,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') @@ -124,7 +132,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 # Only build shared_glapi if at least one OpenGL API is enabled with_shared_glapi = with_shared_glapi and with_any_opengl -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system()) +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system()) dri_drivers = get_option('dri-drivers') if dri_drivers.contains('auto') @@ -162,7 +170,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 +207,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 != [''] @@ -242,10 +248,6 @@ with_amd_vk = _vulkan_drivers.contains('amd') with_freedreno_vk = _vulkan_drivers.contains('freedreno') with_any_vk = _vulkan_drivers.length() != 0 and _vulkan_drivers != [''] -if with_freedreno_vk and get_option('I-love-half-baked-turnips') != true - error('Cannot enable freedreno vulkan driver') -endif - if with_dri_swrast and (with_gallium_softpipe or with_gallium_swr) error('Only one swrast provider can be built') endif @@ -390,7 +392,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. -if not with_platform_android or get_option('platform-sdk-version') >= 29 +if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29) pre_args += '-DUSE_ELF_TLS' endif @@ -434,6 +436,7 @@ if with_vulkan_icd_dir == '' with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d') endif +# GNU/Hurd includes egl_dri2, without drm. with_dri2 = (with_dri or with_any_vk) and (with_dri_platform == 'drm' or host_machine.system() == 'gnu') _dri3 = get_option('dri3') @@ -495,6 +498,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,8 +890,10 @@ 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__' elif host_machine.system() == 'windows' pre_args += [ '-D_WINDOWS', '-D_WIN32_WINNT=0x0601', '-D_WINVER=0x0601', @@ -937,28 +946,45 @@ if cc.get_id() == 'msvc' cpp_args += '-Wno-microsoft-enum-value' endif else - foreach a : ['-Werror=implicit-function-declaration', - '-Werror=missing-prototypes', - '-Werror=return-type', - '-Werror=incompatible-pointer-types', - '-Werror=format', - '-Wformat-security', - '-Wno-missing-field-initializers', - '-Wno-format-truncation', - '-fno-math-errno', - '-fno-trapping-math', - '-Qunused-arguments'] + _trial = [ + '-Werror=implicit-function-declaration', + '-Werror=missing-prototypes', + '-Werror=return-type', + '-Werror=empty-body', + '-Werror=incompatible-pointer-types', + '-Werror=int-conversion', + '-Wno-missing-field-initializers', + '-Wno-format-truncation', + '-fno-math-errno', + '-fno-trapping-math', + '-Qunused-arguments', + '-fno-common', + ] + # MinGW chokes on format specifiers and I can't get it all working + if not (cc.get_id() == 'gcc' and host_machine.system() == 'windows') + _trial += ['-Werror=format', '-Wformat-security'] + endif + foreach a : _trial if cc.has_argument(a) c_args += a endif endforeach - # Check for generic C++ arguments - foreach a : ['-Werror=return-type', - '-Werror=format', - '-Wformat-security', - '-fno-math-errno', '-fno-trapping-math', - '-Qunused-arguments'] + _trial = [ + '-Werror=return-type', + '-Werror=empty-body', + '-Wno-non-virtual-dtor', + '-Wno-missing-field-initializers', + '-Wno-format-truncation', + '-fno-math-errno', + '-fno-trapping-math', + '-Qunused-arguments', + ] + # MinGW chokes on format specifiers and I can't get it all working + if not (cc.get_id() == 'gcc' and host_machine.system() == 'windows') + _trial += ['-Werror=format', '-Wformat-security'] + endif + foreach a : _trial if cpp.has_argument(a) cpp_args += a endif @@ -974,24 +1000,10 @@ else c_vis_args += '-fvisibility=hidden' endif - foreach a : ['-Werror=return-type', - '-Werror=format', - '-Wformat-security', - '-Wno-non-virtual-dtor', - '-Wno-missing-field-initializers', - '-Wno-format-truncation', - '-fno-math-errno', - '-fno-trapping-math', - '-Qunused-arguments'] - if cpp.has_argument(a) - cpp_args += a - endif - endforeach - - # 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 @@ -1027,7 +1039,7 @@ if host_machine.system() == 'windows' endif endif -if host_machine.cpu_family().startswith('x86') +if host_machine.cpu_family().startswith('x86') and cc.get_id() != 'msvc' pre_args += '-DUSE_SSE41' with_sse41 = true sse41_args = ['-msse4.1'] @@ -1145,7 +1157,7 @@ foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h' endif endforeach -foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get', 'memfd_create', 'random_r'] +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 @@ -1158,6 +1170,21 @@ elif with_tools.contains('intel') error('Intel tools require the program_invocation_name variable') endif +# MinGW provides a __builtin_posix_memalign function, but not a posix_memalign. +# This means that this check will succeed, but then compilation will later +# fail. MSVC doesn't have this function at all, so only check for it on +# non-windows platforms. +if host_machine.system() != 'windows' + if cc.has_function('posix_memalign') + pre_args += '-DHAVE_POSIX_MEMALIGN' + endif +endif + +if cc.has_member('struct dirent', 'd_type', prefix: '''#include + #include ''') + pre_args += '-DHAVE_DIRENT_D_TYPE' +endif + # strtod locale support if cc.links(''' #define _GNU_SOURCE @@ -1209,14 +1236,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') @@ -1228,7 +1253,7 @@ elif with_dri_i965 and with_shader_cache endif # Determine whether or not the rt library is needed for time functions -if cc.has_function('clock_gettime') +if host_machine.system() == 'windows' or cc.has_function('clock_gettime') dep_clock = null_dep else dep_clock = cc.find_library('rt') @@ -1237,6 +1262,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' @@ -1254,7 +1290,11 @@ if dep_thread.found() and host_machine.system() != 'windows' pre_args += '-DPTHREAD_SETAFFINITY_IN_NP_HEADER' endif endif -dep_expat = dependency('expat', fallback : ['expat', 'expat_dep']) +if host_machine.system() != 'windows' + dep_expat = dependency('expat', fallback : ['expat', 'expat_dep']) +else + dep_expat = null_dep +endif # this only exists on linux so either this is linux and it will be found, or # it's not linux and wont dep_m = cc.find_library('m', required : false) @@ -1268,7 +1308,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' @@ -1320,7 +1360,8 @@ endforeach with_gallium_drisw_kms = false dep_libdrm = dependency( 'libdrm', version : '>=' + _drm_ver, - required : with_dri2 or with_dri3 + # GNU/Hurd includes egl_dri2, without drm. + required : (with_dri2 and host_machine.system() != 'gnu') or with_dri3 ) if dep_libdrm.found() pre_args += '-DHAVE_LIBDRM' @@ -1329,7 +1370,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'] @@ -1353,8 +1394,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' @@ -1368,7 +1417,8 @@ 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() endif @@ -1379,7 +1429,19 @@ if with_llvm # LLVM can be built without rtti, turning off rtti changes the ABI of C++ # 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' + # + # In meson 0.51.0 we can use cmake to find LLVM in addittion to meson's + # builtin llvm-config based finder. A new generic variable getter method + # has also been added, so we'll use that if we can, to cover the cmake case. + if dep_llvm.type_name() == 'internal' + _rtti = subproject('llvm').get_variable('has_rtti', true) + elif meson.version().version_compare('>=0.51') + # The CMake finder will return 'ON', the llvm-config will return 'YES' + _rtti = ['ON', 'YES'].contains(dep_llvm.get_variable(cmake : 'LLVM_ENABLE_RTTI', configtool: 'has-rtti')) + else + _rtti = dep_llvm.get_configtool_variable('has-rtti') == 'YES' + endif + if not _rtti 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.') elif with_gallium_opencl @@ -1408,12 +1470,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 @@ -1428,8 +1486,39 @@ endif # pthread stubs. Lets not and say we didn't -prog_bison = find_program('bison', required : with_any_opengl) -prog_flex = find_program('flex', required : with_any_opengl) +if host_machine.system() == 'windows' + # Prefer the winflexbison versions, they're much easier to install and have + # better windows support. + + prog_flex = find_program('win_flex', required : false) + if prog_flex.found() + # windows compatibility (uses instead of and _isatty, + # _fileno functions) + prog_flex = [prog_flex, '--wincompat'] + else + prog_flex = [find_program('lex', 'flex', required : with_any_opengl)] + endif + # Force flex to use const keyword in prototypes, as relies on __cplusplus or + # __STDC__ macro to determine whether it's safe to use const keyword, but + # MSVC never defines __STDC__ unless we disable all MSVC extensions. + prog_flex += '-DYY_USE_CONST=' + + prog_bison = find_program('win_bison', required : false) + if not prog_bison.found() + prog_bison = find_program('yacc', 'bison', required : with_any_opengl) + endif +else + prog_bison = find_program('bison', required : with_any_opengl) + + # Disable deprecated keyword warnings, since we have to use them for + # old-bison compat. See discussion in + # https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2161 + if meson.version().version_compare('>= 0.52.0') and find_program('bison', required : false, version : '> 2.3').found() + prog_bison = [prog_bison, '-Wno-deprecated'] + endif + + prog_flex = find_program('flex', required : with_any_opengl) +endif dep_selinux = null_dep if get_option('selinux') @@ -1450,7 +1539,11 @@ if with_osmesa != 'none' if with_osmesa == 'gallium' and not with_gallium_softpipe error('OSMesa gallium requires gallium softpipe or llvmpipe.') endif - osmesa_lib_name = 'OSMesa' + if host_machine.system() == 'windows' + osmesa_lib_name = 'osmesa' + else + osmesa_lib_name = 'OSMesa' + endif osmesa_bits = get_option('osmesa-bits') if osmesa_bits != '8' if with_dri or with_glx != 'disabled' @@ -1618,7 +1711,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