X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=0e8aa25d336259d0c90db403540534234582e3f2;hb=c45c889f95b07cc95cf5ad6fdefc2fa9bb66b960;hp=2ebce75b13b80f1f30161d30895e607424e5f08b;hpb=ed65aeec7810a7d98a19461ba933bd77268cb0f6;p=mesa.git diff --git a/meson.build b/meson.build index 2ebce75b13b..0e8aa25d336 100644 --- a/meson.build +++ b/meson.build @@ -61,11 +61,11 @@ endif dri_drivers_path = get_option('dri-drivers-path') if dri_drivers_path == '' - dri_drivers_path = join_paths(get_option('libdir'), 'dri') + dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri') endif dri_search_path = get_option('dri-search-path') if dri_search_path == '' - dri_search_path = join_paths(get_option('prefix'), dri_drivers_path) + dri_search_path = dri_drivers_path endif with_gles1 = get_option('gles1') @@ -131,8 +131,8 @@ if _drivers.contains('auto') ] elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) _drivers = [ - 'kmsro', 'v3d', 'vc4', 'freedreno', 'etnaviv', 'imx', 'nouveau', - 'tegra', 'virgl', 'swrast', + 'kmsro', 'v3d', 'vc4', 'freedreno', 'etnaviv', 'nouveau', + 'tegra', 'virgl', 'lima', 'swrast' ] else error('Unknown architecture @0@. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.'.format( @@ -154,18 +154,20 @@ with_gallium_freedreno = _drivers.contains('freedreno') with_gallium_softpipe = _drivers.contains('swrast') with_gallium_vc4 = _drivers.contains('vc4') with_gallium_v3d = _drivers.contains('v3d') +with_gallium_panfrost = _drivers.contains('panfrost') with_gallium_etnaviv = _drivers.contains('etnaviv') -with_gallium_imx = _drivers.contains('imx') with_gallium_tegra = _drivers.contains('tegra') +with_gallium_iris = _drivers.contains('iris') with_gallium_i915 = _drivers.contains('i915') with_gallium_svga = _drivers.contains('svga') with_gallium_virgl = _drivers.contains('virgl') with_gallium_swr = _drivers.contains('swr') +with_gallium_lima = _drivers.contains('lima') if cc.get_id() == 'intel' - if meson.version().verson_compare('< 0.49.0') + 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().verson_compare('== 0.49.0') + 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 endif @@ -202,19 +204,21 @@ endif with_intel_vk = _vulkan_drivers.contains('intel') 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 if with_dri_i915 and with_gallium_i915 error('Only one i915 provider can be built') endif -if with_gallium_imx and not with_gallium_etnaviv - error('IMX driver requires etnaviv driver') -endif -if with_gallium_kmsro and not with_gallium_vc4 - error('kmsro driver requires vc4 driver') +if with_gallium_kmsro and not (with_gallium_vc4 or with_gallium_etnaviv or with_gallium_freedreno or with_gallium_panfrost or with_gallium_lima) + error('kmsro driver requires one or more renderonly drivers (vc4, etnaviv, freedreno, panfrost, lima)') endif if with_gallium_tegra and not with_gallium_nouveau error('tegra driver requires nouveau driver') @@ -372,13 +376,17 @@ if with_glvnd elif with_glx == 'disabled' and not with_egl error('glvnd requires DRI based GLX and/or EGL') endif + if get_option('egl-lib-suffix') != '' + error('''EGL lib suffix can't be used with libglvnd''') + endif endif if with_vulkan_icd_dir == '' with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d') endif -with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm' +with_dri2 = (with_dri or with_any_vk) and (with_dri_platform == 'drm' or + host_machine.system() == 'gnu') _dri3 = get_option('dri3') if _dri3 == 'auto' with_dri3 = system_has_kms_drm and with_dri2 @@ -612,7 +620,7 @@ with_gallium_xa = _xa != 'false' d3d_drivers_path = get_option('d3d-drivers-path') if d3d_drivers_path == '' - d3d_drivers_path = join_paths(get_option('libdir'), 'd3d') + d3d_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'd3d') endif with_gallium_st_nine = get_option('gallium-nine') @@ -620,7 +628,8 @@ if with_gallium_st_nine if not with_gallium_softpipe 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) + or with_gallium_r300 or with_gallium_svga or with_gallium_i915 + or with_gallium_iris) error('The nine state tracker requires at least one non-swrast gallium driver.') endif if not with_dri3 @@ -718,6 +727,9 @@ if with_platform_android dependency('hardware'), dependency('sync'), ] + if get_option('platform-sdk-version') >= 26 + dep_android += dependency('nativewindow') + endif pre_args += '-DHAVE_ANDROID_PLATFORM' endif if with_platform_haiku @@ -804,6 +816,7 @@ endif c_args = [] foreach a : ['-Werror=implicit-function-declaration', '-Werror=missing-prototypes', '-Werror=return-type', + '-Werror=incompatible-pointer-types', '-fno-math-errno', '-fno-trapping-math', '-Qunused-arguments'] if cc.has_argument(a) @@ -1222,17 +1235,9 @@ if _llvm != 'false' endif if with_llvm _llvm_version = dep_llvm.version().split('.') - - # 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 - pre_args += [ '-DHAVE_LLVM=0x0@0@0@1@'.format(_llvm_version[0], _llvm_version[1]), - '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch), + '-DMESA_LLVM_VERSION_STRING="@0@"'.format(dep_llvm.version()), ] # LLVM can be built without rtti, turning off rtti changes the ABI of C++ @@ -1241,11 +1246,15 @@ if with_llvm 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.') + elif with_gallium_opencl + error('The Clover OpenCL state tracker requires rtti, you need to turn off clover 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.') +elif with_gallium_opencl + error('The OpenCL "Clover" state tracker requires LLVM, but LLVM is disabled.') endif if (with_amd_vk or with_gallium_radeonsi or with_gallium_opencl or @@ -1404,7 +1413,7 @@ if with_platform_x11 dep_xcb_xfixes = dependency('xcb-xfixes') endif if with_xlib_lease - dep_xcb_xrandr = dependency('xcb-randr', version : '>= 1.12') + dep_xcb_xrandr = dependency('xcb-randr') dep_xlib_xrandr = dependency('xrandr', version : '>= 1.3') endif endif @@ -1433,8 +1442,6 @@ foreach a : cpp_args add_project_arguments(a, language : ['cpp']) endforeach -inc_include = include_directories('include') - gl_priv_reqs = [] if with_glx == 'xlib' or with_glx == 'gallium-xlib' @@ -1468,6 +1475,10 @@ pkg = import('pkgconfig') env_test = environment() env_test.set('NM', find_program('nm').path()) +# 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 +gcc_lto_quirk = (cc.get_id() == 'gcc') ? ['-fno-lto'] : [] + subdir('include') subdir('bin') subdir('src')