X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=meson.build;h=9cbf6a7f7e772adb876053746bd71ab5fd89d2a2;hp=464bbed485a32e2d10bdd34159fcb353cb14a6b8;hb=6bbd96259ab9a92885e2c78ce8399a5fd6064078;hpb=3b74e6fa28037ee2d3fc0824275a9e1c509a0e2c diff --git a/meson.build b/meson.build index 464bbed485a..9cbf6a7f7e7 100644 --- a/meson.build +++ b/meson.build @@ -51,6 +51,7 @@ pre_args = [ with_vulkan_icd_dir = get_option('vulkan-icd-dir') with_tests = get_option('build-tests') +with_aco_tests = get_option('build-aco-tests') with_glx_read_only_text = get_option('glx-read-only-text') with_glx_direct = get_option('glx-direct') with_osmesa = get_option('osmesa') @@ -242,9 +243,9 @@ _vulkan_drivers = get_option('vulkan-drivers') if _vulkan_drivers.contains('auto') if system_has_kms_drm if host_machine.cpu_family().startswith('x86') - _vulkan_drivers = ['amd', 'intel'] + _vulkan_drivers = ['amd', 'intel', 'swrast'] elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) - _vulkan_drivers = [] + _vulkan_drivers = ['swrast'] else error('Unknown architecture @0@. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.'.format( host_machine.cpu_family())) @@ -261,8 +262,13 @@ endif with_intel_vk = _vulkan_drivers.contains('intel') with_amd_vk = _vulkan_drivers.contains('amd') with_freedreno_vk = _vulkan_drivers.contains('freedreno') +with_libresoc_vk = _vulkan_drivers.contains('libre-soc') +with_swrast_vk = _vulkan_drivers.contains('swrast') with_any_vk = _vulkan_drivers.length() != 0 +if with_swrast_vk and not with_gallium_softpipe + error('swrast vulkan requires gallium swrast') +endif if with_dri_swrast and (with_gallium_softpipe or with_gallium_swr) error('Only one swrast provider can be built') endif @@ -275,6 +281,9 @@ endif if with_gallium_tegra and not with_gallium_nouveau error('tegra driver requires nouveau driver') endif +if with_aco_tests and not with_amd_vk + error('ACO tests require Radv') +endif if host_machine.system() == 'darwin' with_dri_platform = 'apple' @@ -293,9 +302,9 @@ endif _platforms = get_option('platforms') if _platforms.contains('auto') if system_has_kms_drm - _platforms = ['x11', 'wayland', 'drm', 'surfaceless'] + _platforms = ['x11', 'wayland'] elif ['darwin', 'cygwin'].contains(host_machine.system()) - _platforms = ['x11', 'surfaceless'] + _platforms = ['x11'] elif ['haiku'].contains(host_machine.system()) _platforms = ['haiku'] elif host_machine.system() == 'windows' @@ -309,27 +318,21 @@ endif with_platform_android = _platforms.contains('android') with_platform_x11 = _platforms.contains('x11') with_platform_wayland = _platforms.contains('wayland') -with_platform_drm = _platforms.contains('drm') with_platform_haiku = _platforms.contains('haiku') -with_platform_surfaceless = _platforms.contains('surfaceless') with_platform_windows = _platforms.contains('windows') -if _platforms.length() != 0 - egl_native_platform = _platforms[0] +if _platforms.contains('surfaceless') + warning('Platform `surfaceless` is now always selected; setting this option will be an error in Mesa 20.3') endif -_xlib_lease = get_option('xlib-lease') -if _xlib_lease == 'true' - _xlib_lease = 'enabled' - warning('xlib_lease option "true" deprecated, please use "enabled" instead.') -elif _xlib_lease == 'false' - _xlib_lease = 'disabled' - warning('xlib_lease option "false" deprecated, please use "disabled" instead.') +if _platforms.contains('drm') + warning('Platform `drm` is now automatically selected; setting this option will be an error in Mesa 20.3') endif -if _xlib_lease == 'auto' - with_xlib_lease = with_platform_x11 and with_platform_drm + +if _platforms.length() != 0 + egl_native_platform = _platforms[0] else - with_xlib_lease = _xlib_lease == 'enabled' + egl_native_platform = 'surfaceless' endif with_glx = get_option('glx') @@ -382,6 +385,20 @@ if with_gbm and not system_has_kms_drm error('GBM only supports DRM/KMS platforms') endif +_xlib_lease = get_option('xlib-lease') +if _xlib_lease == 'true' + _xlib_lease = 'enabled' + warning('xlib_lease option "true" deprecated, please use "enabled" instead.') +elif _xlib_lease == 'false' + _xlib_lease = 'disabled' + warning('xlib_lease option "false" deprecated, please use "disabled" instead.') +endif +if _xlib_lease == 'auto' + with_xlib_lease = with_platform_x11 and system_has_kms_drm +else + with_xlib_lease = _xlib_lease == 'enabled' +endif + _egl = get_option('egl') if _egl == 'true' _egl = 'enabled' @@ -393,15 +410,13 @@ endif if _egl == 'auto' with_egl = ( not ['darwin', 'windows'].contains(host_machine.system()) and - with_dri and with_shared_glapi and _platforms.length() != 0 + with_dri and with_shared_glapi ) elif _egl == 'enabled' if not with_dri error('EGL requires dri') elif not with_shared_glapi error('EGL requires shared-glapi') - elif _platforms.length() == 0 - 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()) @@ -412,18 +427,11 @@ else with_egl = false endif -if with_egl and not (with_platform_drm or with_platform_surfaceless or with_platform_android) - if with_gallium_radeonsi - error('RadeonSI requires the drm, surfaceless or android platform when using EGL') - endif - if with_gallium_virgl - error('Virgl requires the drm, surfaceless or android platform when using EGL') - endif -endif - # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. -if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29) +use_elf_tls = false +if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) pre_args += '-DUSE_ELF_TLS' + use_elf_tls = true endif if with_glx != 'disabled' @@ -542,6 +550,10 @@ if with_gallium_zink dep_vulkan = dependency('vulkan') endif +if with_vulkan_overlay_layer or with_aco_tests + prog_glslang = find_program('glslangValidator') +endif + _xvmc = get_option('gallium-xvmc') if _xvmc == 'true' _xvmc = 'enabled' @@ -777,7 +789,6 @@ if _power8 != 'disabled' 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.') @@ -786,31 +797,10 @@ if _opencl != 'disabled' dep_clc = dependency('libclc') with_gallium_opencl = true with_opencl_icd = _opencl == 'icd' - - with_opencl_spirv = get_option('opencl-spirv') - if with_opencl_spirv - dep_spirv_tools = dependency('SPIRV-Tools', required : true, version : '>= 2018.0') - # LLVMSPIRVLib is available at https://github.com/KhronosGroup/SPIRV-LLVM-Translator - dep_llvmspirvlib = dependency('LLVMSPIRVLib', required : true, version : '>= 0.2.1') - else - dep_spirv_tools = null_dep - dep_llvmspirvlib = null_dep - endif - - 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 - dep_spirv_tools = null_dep - dep_llvmspirvlib = null_dep with_gallium_opencl = false with_opencl_icd = false - with_opencl_spirv = false endif gl_pkgconfig_c_flags = [] @@ -837,28 +827,32 @@ else pre_args += '-DEGL_NO_X11' gl_pkgconfig_c_flags += '-DEGL_NO_X11' endif -if with_platform_drm - if with_egl and not with_gbm - error('EGL drm platform requires gbm') - endif +if with_gbm pre_args += '-DHAVE_DRM_PLATFORM' endif -if with_platform_surfaceless - pre_args += '-DHAVE_SURFACELESS_PLATFORM' + +with_android_stub = get_option('android-stub') +if with_android_stub and not with_platform_android + error('`-D android-stub=true` makes no sense without `-D platforms=android`') endif + if with_platform_android - dep_android = [ - dependency('cutils'), - dependency('hardware'), - dependency('sync'), - ] - if with_gallium - dep_android += dependency('backtrace') - endif - if get_option('platform-sdk-version') >= 26 - dep_android += dependency('nativewindow') + if not with_android_stub + dep_android = [ + dependency('cutils'), + dependency('hardware'), + dependency('sync'), + dependency('backtrace') + ] + if get_option('platform-sdk-version') >= 26 + dep_android += dependency('nativewindow') + endif endif - pre_args += '-DHAVE_ANDROID_PLATFORM' + pre_args += [ + '-DHAVE_ANDROID_PLATFORM', + '-DANDROID', + '-DANDROID_API_LEVEL=' + get_option('platform-sdk-version').to_string() + ] endif if with_platform_haiku pre_args += '-DHAVE_HAIKU_PLATFORM' @@ -941,7 +935,7 @@ elif host_machine.system() == 'sunos' pre_args += '-D__EXTENSIONS__' elif host_machine.system() == 'windows' pre_args += [ - '-D_WINDOWS', '-D_WIN32_WINNT=0x0601', '-DWINVER=0x0601', + '-D_WINDOWS', '-D_WIN32_WINNT=0x0A00', '-DWINVER=0x0A00', '-DPIPE_SUBSYSTEM_WINDOWS_USER', '-D_USE_MATH_DEFINES', # XXX: scons doesn't use this for mingw ] @@ -958,6 +952,8 @@ elif host_machine.system() == 'windows' else pre_args += ['-D__MSVCRT_VERSION__=0x0700'] endif +elif host_machine.system() == 'openbsd' + pre_args += '-D_ISOC11_SOURCE' endif # Check for generic C arguments @@ -980,6 +976,10 @@ if cc.get_id() == 'msvc' '/wd4146', # unary minus operator applied to unsigned type, result still unsigned '/wd4200', # nonstandard extension used: zero-sized array in struct/union '/wd4624', # destructor was implicitly defined as deleted [from LLVM] + '/wd4309', # 'initializing': truncation of constant value + '/wd4838', # conversion from 'int' to 'const char' requires a narrowing conversion + '/we4020', # Error when passing the wrong number of parameters + '/we4024', # Error when passing different type of parameter ] if cc.has_argument(a) c_args += a @@ -1000,6 +1000,7 @@ else '-Werror=empty-body', '-Werror=incompatible-pointer-types', '-Werror=int-conversion', + '-Wimplicit-fallthrough', '-Wno-missing-field-initializers', '-Wno-format-truncation', '-fno-math-errno', @@ -1206,7 +1207,7 @@ if not ['linux'].contains(host_machine.system()) endif endif -foreach h : ['xlocale.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h', 'sys/shm.h', 'cet.h'] +foreach h : ['xlocale.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h', 'sys/shm.h', 'cet.h', 'pthread_np.h'] if cc.check_header(h) pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify()) endif @@ -1345,12 +1346,6 @@ if dep_thread.found() and host_machine.system() != 'windows' args : '-D_GNU_SOURCE') pre_args += '-DHAVE_PTHREAD_SETAFFINITY' endif - if cc.has_function( - 'pthread_setaffinity_np', - dependencies : dep_thread, - prefix : '#include ') - pre_args += '-DPTHREAD_SETAFFINITY_IN_NP_HEADER' - endif endif if host_machine.system() != 'windows' dep_expat = dependency('expat', fallback : ['expat', 'expat_dep']) @@ -1372,7 +1367,7 @@ dep_libdrm_intel = null_dep _drm_amdgpu_ver = '2.4.100' _drm_radeon_ver = '2.4.71' -_drm_nouveau_ver = '2.4.66' +_drm_nouveau_ver = '2.4.102' _drm_intel_ver = '2.4.75' _drm_ver = '2.4.81' @@ -1447,7 +1442,8 @@ if with_gallium_opencl ] endif -if with_amd_vk or with_gallium_radeonsi +with_opencl_spirv = _opencl != 'disabled' and get_option('opencl-spirv') +if with_amd_vk or with_gallium_radeonsi or with_opencl_spirv _llvm_version = '>= 8.0.0' elif with_gallium_swr _llvm_version = '>= 6.0.0' @@ -1508,6 +1504,7 @@ endif if with_llvm pre_args += '-DLLVM_AVAILABLE' pre_args += '-DMESA_LLVM_VERSION_STRING="@0@"'.format(dep_llvm.version()) + pre_args += '-DLLVM_IS_SHARED=@0@'.format(_shared_llvm.to_int()) # 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 @@ -1540,6 +1537,30 @@ elif with_gallium_opencl error('The OpenCL "Clover" state tracker requires LLVM, but LLVM is disabled.') endif +if with_opencl_spirv + chosen_llvm_version_array = dep_llvm.version().split('.') + chosen_llvm_version_major = chosen_llvm_version_array[0].to_int() + chosen_llvm_version_minor = chosen_llvm_version_array[1].to_int() + + # Require an SPIRV-LLVM-Translator version compatible with the chosen LLVM + # one. + _llvmspirvlib_version = [ + # This first version check is still needed as maybe LLVM 8.0 was picked but + # we do not want to accept SPIRV-LLVM-Translator 8.0.0.1 as that version does + # not have the required API and those are only available starting from + # 8.0.1.3. + '>= 8.0.1.3', + '>= @0@.@1@'.format(chosen_llvm_version_major, chosen_llvm_version_minor), + '< @0@.@1@'.format(chosen_llvm_version_major, chosen_llvm_version_minor + 1) ] + + dep_spirv_tools = dependency('SPIRV-Tools', required : true, version : '>= 2018.0') + # LLVMSPIRVLib is available at https://github.com/KhronosGroup/SPIRV-LLVM-Translator + dep_llvmspirvlib = dependency('LLVMSPIRVLib', required : true, version : _llvmspirvlib_version) +else + dep_spirv_tools = null_dep + dep_llvmspirvlib = null_dep +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) @@ -1552,7 +1573,7 @@ endif dep_glvnd = null_dep if with_glvnd - dep_glvnd = dependency('libglvnd', version : '>= 1.2.0') + dep_glvnd = dependency('libglvnd', version : '>= 1.3.2') pre_args += '-DUSE_LIBGLVND=1' endif @@ -1644,7 +1665,7 @@ if with_osmesa != 'none' osmesa_bits = get_option('osmesa-bits') if osmesa_bits != '8' if with_dri or with_glx != 'disabled' - error('OSMesa bits must be 8 if building glx or dir based drivers') + error('OSMesa bits must be 8 if building glx or dri based drivers') endif osmesa_lib_name = osmesa_lib_name + osmesa_bits pre_args += [ @@ -1695,6 +1716,7 @@ dep_xcb_sync = null_dep dep_xcb_xfixes = null_dep dep_xshmfence = null_dep dep_xcb_xrandr = null_dep +dep_xcb_shm = null_dep dep_xlib_xrandr = null_dep if with_platform_x11 if with_glx == 'xlib' or with_glx == 'gallium-xlib' @@ -1705,8 +1727,9 @@ if with_platform_x11 dep_x11 = dependency('x11') dep_xext = dependency('xext') dep_xdamage = dependency('xdamage', version : '>= 1.1') - dep_xfixes = dependency('xfixes') + dep_xfixes = dependency('xfixes', version : '>= 2.0') dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1') + dep_xcb_shm = dependency('xcb-shm') endif if (with_any_vk or with_glx == 'dri' or with_egl or (with_gallium_vdpau or with_gallium_xvmc or with_gallium_va or @@ -1760,10 +1783,10 @@ endif _sensors = get_option('lmsensors') if _sensors == 'true' _sensors = 'enabled' - warning('sensors option "true" deprecated, please use "enabled" instead.') + warning('lmsensors option "true" deprecated, please use "enabled" instead.') elif _sensors == 'false' _sensors = 'disabled' - warning('sensors option "false" deprecated, please use "disabled" instead.') + warning('lmsensors option "false" deprecated, please use "disabled" instead.') endif if _sensors != 'disabled' dep_lmsensors = cc.find_library('sensors', required : _sensors == 'enabled') @@ -1774,6 +1797,19 @@ else dep_lmsensors = null_dep endif +# If the compiler supports it, put function and data symbols in their +# own sections and GC the sections after linking. This lets drivers +# drop shared code unused by that specific driver (particularly +# relevant for Vulkan drivers). +if cc.has_link_argument('-Wl,--gc-sections') + add_project_arguments('-Wl,--gc-sections', language : ['c', 'cpp']) + foreach a: ['-ffunction-sections', '-fdata-sections'] + if cc.has_argument(a) + add_project_arguments(a, language : ['c', 'cpp']) + endif + endforeach +endif + foreach a : pre_args add_project_arguments(a, language : ['c', 'cpp']) endforeach @@ -1812,6 +1848,12 @@ if dep_dl.found() gl_priv_libs += '-ldl' endif +# FIXME: autotools lists this as incomplete +gbm_priv_libs = [] +if dep_dl.found() + gbm_priv_libs += '-ldl' +endif + pkg = import('pkgconfig') if host_machine.system() == 'windows' @@ -1896,7 +1938,11 @@ if with_egl lines += 'EGL drivers: ' + ' '.join(egl_drivers) endif lines += 'GBM: ' + (with_gbm ? 'yes' : 'no') -if _platforms.length() != 0 +if with_egl or with_any_vk + _platforms += 'surfaceless' + if with_gbm + _platforms += 'drm' + endif lines += 'EGL/Vulkan/VL platforms: ' + ' '.join(_platforms) endif