X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=7a536982da69f4c60fb58f2f19158b2edabbfd65;hb=8a1ab9a166dd358f0e71a1cc98e8b6c20b5d8822;hp=e759bbf96a579a23dbed1ed2a417a0cd07e27546;hpb=0b736f7fd4852bdea2ac6be9a018a41065252233;p=mesa.git diff --git a/meson.build b/meson.build index e759bbf96a5..7a536982da6 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017-2018 Intel Corporation +# Copyright © 2017-2019 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 @@ -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 = [ - 'pl111', 'v3d', 'vc4', 'freedreno', 'etnaviv', 'imx', 'nouveau', - 'tegra', 'virgl', 'swrast', + 'kmsro', 'v3d', 'vc4', 'freedreno', 'etnaviv', 'nouveau', + 'tegra', 'virgl', 'swrast' ] else error('Unknown architecture @0@. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.'.format( @@ -145,7 +145,7 @@ if _drivers.contains('auto') host_machine.system())) endif endif -with_gallium_pl111 = _drivers.contains('pl111') +with_gallium_kmsro = _drivers.contains('kmsro') with_gallium_radeonsi = _drivers.contains('radeonsi') with_gallium_r300 = _drivers.contains('r300') with_gallium_r600 = _drivers.contains('r600') @@ -154,14 +154,23 @@ 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') +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 +endif + with_gallium = _drivers.length() != 0 and _drivers != [''] if with_gallium and system_has_kms_drm @@ -194,19 +203,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_pl111 and not with_gallium_vc4 - error('pl111 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) + error('kmsro driver requires one or more renderonly drivers (vc4, etnaviv, freedreno, panfrost)') endif if with_gallium_tegra and not with_gallium_nouveau error('tegra driver requires nouveau driver') @@ -370,7 +381,8 @@ 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 @@ -382,8 +394,8 @@ if with_any_vk and (with_platform_x11 and not with_dri3) error('Vulkan drivers require dri3 for X11 support') endif if with_dri - if with_glx == 'disabled' and not with_egl and not with_gbm - error('building dri drivers require at least one windowing system') + if with_glx == 'disabled' and not with_egl and not with_gbm and with_osmesa != 'classic' + error('building dri drivers require at least one windowing system or classic osmesa') endif endif @@ -604,7 +616,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') @@ -612,7 +624,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 @@ -796,6 +809,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) @@ -1109,7 +1123,7 @@ dep_libdrm_nouveau = null_dep dep_libdrm_etnaviv = null_dep dep_libdrm_intel = null_dep -_drm_amdgpu_ver = '2.4.95' +_drm_amdgpu_ver = '2.4.97' _drm_radeon_ver = '2.4.71' _drm_nouveau_ver = '2.4.66' _drm_etnaviv_ver = '2.4.89' @@ -1396,7 +1410,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 @@ -1425,8 +1439,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' @@ -1460,6 +1472,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')