X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=meson.build;h=f3179c38062979fe0053c3438b49af7fefd5e384;hb=3442672df4d5c4b341bcc354affbd5c1d54e1589;hp=51d19c02b80c85875382580f50b825aba776bdd4;hpb=3e9533d9b88d75d99632fa40e38cfed842d10842;p=mesa.git diff --git a/meson.build b/meson.build index 51d19c02b80..f3179c38062 100644 --- a/meson.build +++ b/meson.build @@ -39,7 +39,6 @@ pre_args = [ '-DVERSION="@0@"'.format(meson.project_version()), '-DPACKAGE_VERSION=VERSION', '-DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa"', - '-D_GNU_SOURCE', ] with_vulkan_icd_dir = get_option('vulkan-icd-dir') @@ -47,17 +46,13 @@ with_tests = get_option('build-tests') with_valgrind = get_option('valgrind') with_libunwind = get_option('libunwind') with_asm = get_option('asm') -with_llvm = get_option('llvm') with_osmesa = get_option('osmesa') +with_swr_arches = get_option('swr-arches').split(',') if get_option('texture-float') pre_args += '-DTEXTURE_FLOAT_ENABLED' message('WARNING: Floating-point texture enabled. Please consult docs/patents.txt and your lawyer before building mesa.') endif -# XXX: yeah, do these -with_appledri = false -with_windowsdri = false - dri_drivers_path = get_option('dri-drivers-path') if dri_drivers_path == '' dri_drivers_path = join_paths(get_option('libdir'), 'dri') @@ -92,6 +87,18 @@ with_dri_r200 = false with_dri_nouveau = false with_dri_swrast = false _drivers = get_option('dri-drivers') +if _drivers == 'auto' + # TODO: PPC, Sparc + if not ['darwin', 'windows'].contains(host_machine.system()) + if ['x86', 'x86_64'].contains(host_machine.cpu_family()) + _drivers = 'i915,i965,r100,r200,nouveau' + else + error('Unknown architecture. Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.') + endif + else + error('Unknown OS. Please pass -Ddri-drivers to set driver options. Patches gladly accepted to fix this.') + endif +endif if _drivers != '' _split = _drivers.split(',') with_dri_i915 = _split.contains('i915') @@ -106,6 +113,8 @@ endif with_gallium = false with_gallium_pl111 = false with_gallium_radeonsi = false +with_gallium_r300 = false +with_gallium_r600 = false with_gallium_nouveau = false with_gallium_freedreno = false with_gallium_softpipe = false @@ -113,11 +122,31 @@ with_gallium_vc4 = false with_gallium_vc5 = false with_gallium_etnaviv = false with_gallium_imx = false +with_gallium_i915 = false +with_gallium_svga = false +with_gallium_virgl = false +with_gallium_swr = false _drivers = get_option('gallium-drivers') +if _drivers == 'auto' + if not ['darwin', 'windows'].contains(host_machine.system()) + # TODO: PPC, Sparc + if ['x86', 'x86_64'].contains(host_machine.cpu_family()) + _drivers = 'r300,r600,radeonsi,nouveau,virgl,svga,swrast' + elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) + _drivers = 'pl111,vc4,vc5,freedreno,etnaviv,imx,virgl,svga,swrast' + else + error('Unknown architecture. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.') + endif + else + error('Unknown OS. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.') + endif +endif if _drivers != '' _split = _drivers.split(',') with_gallium_pl111 = _split.contains('pl111') with_gallium_radeonsi = _split.contains('radeonsi') + with_gallium_r300 = _split.contains('r300') + with_gallium_r600 = _split.contains('r600') with_gallium_nouveau = _split.contains('nouveau') with_gallium_freedreno = _split.contains('freedreno') with_gallium_softpipe = _split.contains('swrast') @@ -125,32 +154,68 @@ if _drivers != '' with_gallium_vc5 = _split.contains('vc5') with_gallium_etnaviv = _split.contains('etnaviv') with_gallium_imx = _split.contains('imx') + with_gallium_i915 = _split.contains('i915') + with_gallium_svga = _split.contains('svga') + with_gallium_virgl = _split.contains('virgl') + with_gallium_swr = _split.contains('swr') with_gallium = true - with_dri = true endif -if not (with_dri or with_gallium) - with_gles1 = false - with_gles2 = false - with_opengl = false - with_any_opengl = false - with_shared_glapi = false +with_intel_vk = false +with_amd_vk = false +with_any_vk = false +_vulkan_drivers = get_option('vulkan-drivers') +if _vulkan_drivers == 'auto' + if not ['darwin', 'windows'].contains(host_machine.system()) + if host_machine.cpu_family().startswith('x86') + _vulkan_drivers = 'amd,intel' + else + error('Unknown architecture. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.') + endif + else + # No vulkan driver supports windows or macOS currently + _vulkan_drivers = '' + endif +endif +if _vulkan_drivers != '' + _split = _vulkan_drivers.split(',') + with_intel_vk = _split.contains('intel') + with_amd_vk = _split.contains('amd') + with_any_vk = with_amd_vk or with_intel_vk endif -if with_dri_swrast and with_gallium_softpipe +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') +endif dep_libdrm_intel = [] -if with_dri_i915 +if with_dri_i915 or with_gallium_i915 dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75') endif -# TODO: other OSes -with_dri_platform = 'drm' +if host_machine.system() == 'darwin' + with_dri_platform = 'apple' +elif ['windows', 'cygwin'].contains(host_machine.system()) + with_dri_platform = 'windows' +elif host_machine.system() == 'linux' + # FIXME: This should include BSD and possibly other systems + with_dri_platform = 'drm' +else + # FIXME: haiku doesn't use dri, and xlib doesn't use dri, probably should + # assert here that one of those cases has been met. + # FIXME: GNU (hurd) ends up here as well, but meson doesn't officially + # support Hurd at time of writing (2017/11) + with_dri_platform = 'none' +endif with_platform_android = false with_platform_wayland = false @@ -159,6 +224,13 @@ with_platform_drm = false with_platform_surfaceless = false egl_native_platform = '' _platforms = get_option('platforms') +if _platforms == 'auto' + if ['linux'].contains(host_machine.system()) + _platforms = 'x11,wayland,drm,surfaceless' + else + error('Unknown OS, no platforms enabled. Patches gladly accepted to fix this.') + endif +endif if _platforms != '' _split = _platforms.split(',') with_platform_android = _split.contains('android') @@ -169,6 +241,35 @@ if _platforms != '' egl_native_platform = _split[0] endif +with_glx = get_option('glx') +if with_glx == 'auto' + if with_dri + with_glx = 'dri' + elif with_gallium + # Even when building just gallium drivers the user probably wants dri + with_glx = 'dri' + elif with_platform_x11 and with_any_opengl and not with_any_vk + # The automatic behavior should not be to turn on xlib based glx when + # building only vulkan drivers + with_glx = 'xlib' + else + with_glx = 'disabled' + endif +endif +if with_glx == 'dri' + if with_gallium + with_dri = true + endif +endif + +if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib') + with_gles1 = false + with_gles2 = false + with_opengl = false + with_any_opengl = false + with_shared_glapi = false +endif + with_gbm = get_option('gbm') if with_gbm == 'auto' and with_dri # TODO: or gallium with_gbm = host_machine.system() == 'linux' @@ -197,13 +298,16 @@ else with_egl = false endif -# TODO: or virgl -if with_egl and with_gallium_radeonsi and not (with_platform_drm or with_platform_surfaceless) - error('RadeonSI requires drm or surfaceless platform when using EGL') +if with_egl and not (with_platform_drm or with_platform_surfaceless) + if with_gallium_radeonsi + error('RadeonSI requires drm or surfaceless platform when using EGL') + endif + if with_gallium_virgl + error('Virgl requires drm or surfaceless platform when using EGL') + endif endif pre_args += '-DGLX_USE_TLS' -with_glx = get_option('glx') if with_glx != 'disabled' if not (with_platform_x11 and with_any_opengl) if with_glx == 'auto' @@ -214,21 +318,17 @@ if with_glx != 'disabled' elif with_glx == 'gallium-xlib' if not with_gallium error('Gallium-xlib based GLX requires at least one gallium driver') + elif not with_gallium_softpipe + error('Gallium-xlib based GLX requires softpipe or llvmpipe.') elif with_dri error('gallium-xlib conflicts with any dri driver') endif - elif with_glx == 'dri' and not with_dri - error('dri based GLX requires at least one DRI driver') - elif with_glx == 'auto' + elif with_glx == 'xlib' if with_dri - with_glx = 'dri' - elif with_gallium - with_glx = 'gallium-xlib' - elif with_platform_x11 and with_any_opengl - with_glx = 'xlib' - else - with_glx = 'disabled' + error('xlib conflicts with any dri driver') endif + elif with_glx == 'dri' and not with_dri + error('dri based GLX requires at least one DRI driver') endif endif @@ -248,20 +348,6 @@ if with_vulkan_icd_dir == '' with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d') endif -with_intel_vk = false -with_amd_vk = false -with_any_vk = false -_vulkan_drivers = get_option('vulkan-drivers') -if _vulkan_drivers != '' - _split = _vulkan_drivers.split(',') - with_intel_vk = _split.contains('intel') - with_amd_vk = _split.contains('amd') - with_any_vk = with_amd_vk or with_intel_vk - if not (with_platform_x11 or with_platform_wayland or with_platform_android) - error('Vulkan requires at least one platform (x11, wayland, android)') - endif -endif - with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm' with_dri3 = get_option('dri3') if with_dri3 == 'auto' @@ -285,21 +371,237 @@ if with_dri or with_gallium endif endif -with_gallium_xvmc = false -with_gallium_vdpau = false -with_gallium_omx = false # this is bellagio -with_gallium_va = false -with_gallium_media = false +dep_vdpau = [] +_vdpau = get_option('gallium-vdpau') +if _vdpau == 'auto' + if not ['linux', 'bsd'].contains(host_machine.system()) + with_gallium_vdpau = false + elif not with_platform_x11 + with_gallium_vdpau = false + elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or + with_gallium_nouveau) + with_gallium_vdpau = false + else + dep_vdpau = dependency('vdpau', version : '>= 1.1', required : false) + with_gallium_vdpau = dep_vdpau.found() + endif +elif _vdpau == 'true' + if not ['linux', 'bsd'].contains(host_machine.system()) + error('VDPAU state tracker can only be build on unix-like OSes.') + elif not with_platform_x11 + error('VDPAU state tracker requires X11 support.') + with_gallium_vdpau = false + elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or + with_gallium_nouveau) + error('VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau.') + endif + dep_vdpau = dependency('vdpau', version : '>= 1.1') + with_gallium_vdpau = true +else + with_gallium_vdpau = false +endif +if with_gallium_vdpau + dep_vdpau = declare_dependency( + compile_args : dep_vdpau.get_pkgconfig_variable('cflags').split() + ) +endif + +if with_gallium_vdpau + pre_args += '-DHAVE_ST_VDPAU' +endif +vdpau_drivers_path = get_option('vdpau-libs-path') +if vdpau_drivers_path == '' + vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau') +endif + +dep_xvmc = [] +_xvmc = get_option('gallium-xvmc') +if _xvmc == 'auto' + if not ['linux', 'bsd'].contains(host_machine.system()) + with_gallium_xvmc = false + elif not with_platform_x11 + with_gallium_xvmc = false + elif not (with_gallium_r600 or with_gallium_nouveau) + with_gallium_xvmc = false + else + dep_xvmc = dependency('xvmc', version : '>= 1.0.6', required : false) + with_gallium_xvmc = dep_xvmc.found() + endif +elif _xvmc == 'true' + if not ['linux', 'bsd'].contains(host_machine.system()) + error('XVMC state tracker can only be build on unix-like OSes.') + elif not with_platform_x11 + error('XVMC state tracker requires X11 support.') + with_gallium_xvmc = false + elif not (with_gallium_r600 or with_gallium_nouveau) + error('XVMC state tracker requires at least one of the following gallium drivers: r600, nouveau.') + endif + dep_xvmc = dependency('xvmc', version : '>= 1.0.6') + with_gallium_xvmc = true +else + with_gallium_xvmc = false +endif +if with_gallium_xvmc + dep_xvmc = declare_dependency( + compile_args : dep_xvmc.get_pkgconfig_variable('cflags').split() + ) +endif + +xvmc_drivers_path = get_option('xvmc-libs-path') +if xvmc_drivers_path == '' + xvmc_drivers_path = get_option('libdir') +endif + +dep_omx = [] +_omx = get_option('gallium-omx') +if _omx == 'auto' + if not ['linux', 'bsd'].contains(host_machine.system()) + with_gallium_omx = false + elif not with_platform_x11 + with_gallium_omx = false + elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) + with_gallium_omx = false + else + dep_omx = dependency('libomxil-bellagio', required : false) + with_gallium_omx = dep_omx.found() + endif +elif _omx == 'true' + if not ['linux', 'bsd'].contains(host_machine.system()) + error('OMX state tracker can only be built on unix-like OSes.') + elif not (with_platform_x11 or with_platform_drm) + error('OMX state tracker requires X11 or drm platform support.') + with_gallium_omx = false + elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) + error('OMX state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau.') + endif + dep_omx = dependency('libomxil-bellagio') + with_gallium_omx = true +else + with_gallium_omx = false +endif + +omx_drivers_path = get_option('omx-libs-path') +if with_gallium_omx + # Figure out where to put the omx driver. + # FIXME: this could all be vastly simplified by adding a 'defined_variable' + # argument to meson's get_pkgconfig_variable method. + if omx_drivers_path == '' + _omx_libdir = dep_omx.get_pkgconfig_variable('libdir') + _omx_drivers_dir = dep_omx.get_pkgconfig_variable('pluginsdir') + if _omx_libdir == get_option('libdir') + omx_drivers_path = _omx_drivers_dir + else + _omx_base_dir = [] + # This will fail on windows. Does OMX run on windows? + _omx_libdir = _omx_libdir.split('/') + _omx_drivers_dir = _omx_drivers_dir.split('/') + foreach o : _omx_drivers_dir + if not _omx_libdir.contains(o) + _omx_base_dir += o + endif + endforeach + omx_drivers_path = join_paths(get_option('libdir'), _omx_base_dir) + endif + endif +endif +if with_gallium_omx + dep_omx = declare_dependency( + compile_args : dep_omx.get_pkgconfig_variable('cflags').split() + ) +endif + dep_va = [] -_drivers = get_option('gallium-media') -if _drivers != '' - _split = _drivers.split(',') - with_gallium_xvmc = _split.contains('xvmc') - with_gallium_vdpau = _split.contains('vdpau') - with_gallium_omx = _split.contains('omx') - with_gallium_va = _split.contains('va') - with_gallium_media = (with_gallium_xvmc or with_gallium_vdpau or - with_gallium_omx or with_gallium_va) +_va = get_option('gallium-va') +if _va == 'auto' + if not ['linux', 'bsd'].contains(host_machine.system()) + with_gallium_va = false + elif not with_platform_x11 + with_gallium_va = false + elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) + with_gallium_va = false + else + dep_va = dependency('libva', version : '>= 0.38.0', required : false) + with_gallium_va = dep_va.found() + endif +elif _va == 'true' + if not ['linux', 'bsd'].contains(host_machine.system()) + error('VA state tracker can only be built on unix-like OSes.') + elif not (with_platform_x11 or with_platform_drm) + error('VA state tracker requires X11 or drm or wayland platform support.') + with_gallium_va = false + elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) + error('VA state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau.') + endif + dep_va = dependency('libva', version : '>= 0.38.0') + with_gallium_va = true +else + with_gallium_va = false +endif +if with_gallium_va + dep_va = declare_dependency( + compile_args : dep_va.get_pkgconfig_variable('cflags').split() + ) +endif + +va_drivers_path = get_option('va-libs-path') +if va_drivers_path == '' + va_drivers_path = join_paths(get_option('libdir'), 'dri') +endif + +_xa = get_option('gallium-xa') +if _xa == 'auto' + if not ['linux', 'bsd'].contains(host_machine.system()) + with_gallium_xa = false + elif not (with_gallium_nouveau or with_gallium_freedreno or with_gallium_i915 + or with_gallium_svga) + with_gallium_xa = false + else + with_gallium_xa = true + endif +elif _xa == 'true' + if not ['linux', 'bsd'].contains(host_machine.system()) + error('XA state tracker can only be built on unix-like OSes.') + elif not (with_gallium_nouveau or with_gallium_freedreno or with_gallium_i915 + or with_gallium_svga) + error('XA state tracker requires at least one of the following gallium drivers: nouveau, freedreno, i915, svga.') + endif + with_gallium_xa = true +else + with_gallium_xa = false +endif + +d3d_drivers_path = get_option('d3d-drivers-path') +if d3d_drivers_path == '' + d3d_drivers_path = join_paths(get_option('libdir'), 'd3d') +endif + +with_gallium_st_nine = get_option('gallium-nine') +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) + error('The nine state tracker requires at least on non-swrast gallium driver.') + endif + if not with_dri3 + error('Using nine with wine requires dri3') + endif +endif + +_opencl = get_option('gallium-opencl') +if _opencl != 'disabled' + if not with_gallium + error('OpenCL Clover implementation requires at least one gallium driver.') + endif + + # TODO: alitvec? + dep_clc = dependency('libclc') + with_gallium_opencl = true + with_opencl_icd = _opencl == 'icd' +else + dep_clc = [] + with_gallium_opencl = false + with_gallium_icd = false endif gl_pkgconfig_c_flags = [] @@ -307,12 +609,8 @@ if with_platform_x11 if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') pre_args += '-DHAVE_X11_PLATFORM' endif - if with_glx == 'xlib' - # TODO - error('TODO') - elif with_glx == 'gallium-xlib' - # TODO - error('TODO') + if with_glx == 'xlib' or with_glx == 'gallium-xlib' + pre_args += '-DUSE_XSHM' else pre_args += '-DGLX_INDIRECT_RENDERING' if with_glx_direct @@ -320,6 +618,8 @@ if with_platform_x11 endif if with_dri_platform == 'drm' pre_args += '-DGLX_USE_DRM' + elif with_dri_platform == 'windows' + pre_args += '-DGLX_USE_WINDOWSGL' endif endif else @@ -405,9 +705,13 @@ if cc.compiles('int foo(void) { return 0; } int bar(void) __attribute__((alias(" name : '__attribute__((alias(...)))') pre_args += '-DHAVE_FUNC_ATTRIBUTE_ALIAS' endif +if cc.compiles('int foo(void) __attribute__((__noreturn__));', + name : '__attribute__((__noreturn__))') + pre_args += '-DHAVE_FUNC_ATTRIBUTE_NORETURN' +endif # TODO: this is very incomplete -if host_machine.system() == 'linux' +if ['linux', 'cygwin'].contains(host_machine.system()) pre_args += '-D_GNU_SOURCE' endif @@ -429,11 +733,25 @@ endif cpp = meson.get_compiler('cpp') cpp_args = [] foreach a : ['-Wall', '-fno-math-errno', '-fno-trapping-math', - '-Qunused-arguments', '-Wno-non-virtual-dtor'] + '-Qunused-arguments'] if cpp.has_argument(a) cpp_args += a endif endforeach + +# For some reason, the test for -Wno-foo always succeeds with gcc, even if the +# option is not supported. Hence, check for -Wfoo instead. +if cpp.has_argument('-Wnon-virtual-dtor') + cpp_args += '-Wno-non-virtual-dtor' +endif + +no_override_init_args = [] +foreach a : ['override-init', 'initializer-overrides'] + if cc.has_argument('-W' + a) + no_override_init_args += '-Wno-' + a + endif +endforeach + cpp_vis_args = [] if cpp.has_argument('-fvisibility=hidden') cpp_vis_args += '-fvisibility=hidden' @@ -453,14 +771,20 @@ foreach a : ['-Werror=pointer-arith', '-Werror=vla'] endif endforeach -no_override_init_args = [] -foreach a : ['-Wno-override-init', '-Wno-initializer-overrides'] - if cc.has_argument(a) - no_override_init_args += a - endif -endforeach +if host_machine.cpu_family().startswith('x86') + pre_args += '-DHAVE_SSE41' + with_sse41 = true + sse41_args = ['-msse4.1'] -# TODO: SSE41 (which is only required for core mesa) + # GCC on x86 (not x86_64) with -msse* assumes a 16 byte aligned stack, but + # that's not guaranteed + if host_machine.cpu_family() == 'x86' + sse41_args += '-mstackrealign' + endif +else + with_sse41 = false + sse41_args = [] +endif # Check for GCC style atomics if cc.compiles('int main() { int n; return __atomic_load_n(&n, __ATOMIC_ACQUIRE); }', @@ -480,20 +804,16 @@ endif # TODO: powr8 # TODO: shared/static? Is this even worth doing? -# I don't think that I need to set any of the debug stuff, I think meson -# handles that for us - -# TODO: ldflags - -# TODO: texture-float (gallium/mesa only) - -# TODO: cross-compiling. I don't think this is relavent to meson - -# FIXME: enable asm when cross compiler -# This is doable (autotools does it), but it's not of immediate concern -if meson.is_cross_build() and host_machine.cpu_family().startswith('x86') - message('Cross compiling, disabling x86/x86_64 asm') - with_asm = false +# Building x86 assembly code requires running x86 binaries. It is possible for +# x86_64 OSes to run x86 binaries, so don't disable asm in those cases +# TODO: it should be possible to use an exe_wrapper to run the binary during +# the build. +if meson.is_cross_build() + if not (build_machine.cpu_family() == 'x86_64' and host_machine.cpu_family() == 'x86' + and build_machine.system() == host_machine.system()) + message('Cross compiling to x86 from non-x86, disabling asm') + with_asm = false + endif endif with_asm_arch = '' @@ -536,7 +856,7 @@ foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h'] endif endforeach -foreach f : ['strtof', 'mkostemp', 'posix_memalign'] +foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get', 'memfd_create'] if cc.has_function(f) pre_args += '-DHAVE_@0@'.format(f.to_upper()) endif @@ -555,7 +875,7 @@ if cc.links(''' const char *s = "1.0"; char *end; double d = strtod_l(s, end, loc); - float f = strtod_l(s, end, loc); + float f = strtof_l(s, end, loc); freelocale(loc); return 0; }''', @@ -602,8 +922,10 @@ endif if cc.has_function('dl_iterate_phdr') pre_args += '-DHAVE_DL_ITERATE_PHDR' -else - # TODO: this is required for vulkan +elif with_intel_vk + error('Intel "Anvil" Vulkan driver requires the dl_iterate_phdr function') +elif with_dri_i965 and get_option('shader-cache') + error('Intel i965 GL driver requires dl_iterate_phdr when built with shader caching.') endif # Determine whether or not the rt library is needed for time functions @@ -625,13 +947,18 @@ endif # TODO: some of these may be conditional dep_zlib = dependency('zlib', version : '>= 1.2.3') +pre_args += '-DHAVE_ZLIB' dep_thread = dependency('threads') -if dep_thread.found() and host_machine.system() == 'linux' +if dep_thread.found() and host_machine.system() != 'windows' pre_args += '-DHAVE_PTHREAD' endif -dep_elf = dependency('libelf', required : false) -if not dep_elf.found() and (with_amd_vk or with_gallium_radeonsi) # TODO: clover, r600 - dep_elf = cc.find_library('elf') +if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 or with_gallium_opencl + dep_elf = dependency('libelf', required : false) + if not dep_elf.found() + dep_elf = cc.find_library('elf') + endif +else + dep_elf = [] endif dep_expat = dependency('expat') # this only exists on linux so either this is linux and it will be found, or @@ -644,9 +971,10 @@ dep_libdrm_nouveau = [] dep_libdrm_etnaviv = [] dep_libdrm_freedreno = [] if with_amd_vk or with_gallium_radeonsi - dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.88') + dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.89') endif -if with_gallium_radeonsi or with_dri_r100 or with_dri_r200 +if (with_gallium_radeonsi or with_dri_r100 or with_dri_r200 or + with_gallium_r300 or with_gallium_r600) dep_libdrm_radeon = dependency('libdrm_radeon', version : '>= 2.4.71') endif if with_gallium_nouveau or with_dri_nouveau @@ -656,39 +984,52 @@ if with_gallium_etnaviv dep_libdrm_etnaviv = dependency('libdrm_etnaviv', version : '>= 2.4.82') endif if with_gallium_freedreno - dep_libdrm_freedreno = dependency('libdrm_freedreno', version : '>= 2.4.74') + dep_libdrm_freedreno = dependency('libdrm_freedreno', version : '>= 2.4.89') endif llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit'] -if with_amd_vk +if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 llvm_modules += ['amdgpu', 'bitreader', 'ipo'] + if with_gallium_r600 + llvm_modules += 'asmparser' + endif endif -dep_llvm = [] -if with_llvm +if with_gallium_opencl + llvm_modules += [ + 'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader', + 'lto', 'option', 'objcarcopts', 'profiledata', + ] + # TODO: optional modules +endif + +_llvm = get_option('llvm') +if _llvm == 'auto' dep_llvm = dependency( - 'llvm', version : '>= 3.9.0', required : with_amd_vk, modules : llvm_modules, + 'llvm', version : '>= 3.9.0', modules : llvm_modules, + required : with_amd_vk or with_gallium_radeonsi or with_gallium_swr or with_gallium_opencl, ) - if dep_llvm.found() - _llvm_version = dep_llvm.version().split('.') - # Development versions of LLVM have an 'svn' suffix, we don't want that for - # our version checks. - _llvm_patch = _llvm_version[2] - if _llvm_patch.endswith('svn') - _llvm_patch = _llvm_patch.split('s')[0] - endif - pre_args += [ - '-DHAVE_LLVM=0x0@0@@1@@2@'.format(_llvm_version[0], _llvm_version[1], _llvm_patch), - '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch), - ] - else - if with_gallium_softpipe - error('Cannot find LLVM to build LLVMPipe. If you wanted softpipe pass -Dllvm=false to meson') - elif with_amd_vk or with_gallium_radeonsi # etc - error('The following drivers requires LLVM: Radv, RadeonSI. One of these is enabled, but LLVM was not found.') - endif + with_llvm = dep_llvm.found() +elif _llvm == 'true' + dep_llvm = dependency('llvm', version : '>= 3.9.0', modules : llvm_modules) + with_llvm = true +else + dep_llvm = [] + with_llvm = false +endif +if with_llvm + _llvm_version = dep_llvm.version().split('.') + # Development versions of LLVM have an 'svn' suffix, we don't want that for + # our version checks. + _llvm_patch = _llvm_version[2] + if _llvm_patch.endswith('svn') + _llvm_patch = _llvm_patch.split('s')[0] endif -elif with_amd_vk or with_gallium_radeonsi - error('The following drivers requires LLVM: Radv, RadeonSI. One of these is enabled, but LLVM is disabled.') + pre_args += [ + '-DHAVE_LLVM=0x0@0@@1@@2@'.format(_llvm_version[0], _llvm_version[1], _llvm_patch), + '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch), + ] +elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr + error('The following drivers requires LLVM: Radv, RadeonSI, SWR. One of these is enabled, but LLVM is disabled.') endif dep_glvnd = [] @@ -728,12 +1069,8 @@ else dep_unwind = [] endif -# TODO: flags for opengl, gles, dri - # TODO: gallium-hud -# TODO: glx provider - if with_osmesa != 'none' if with_osmesa == 'classic' and not with_dri_swrast error('OSMesa classic requires dri (classic) swrast.') @@ -792,7 +1129,11 @@ dep_xcb_sync = [] dep_xcb_xfixes = [] dep_xshmfence = [] if with_platform_x11 - if with_glx == 'dri' and with_dri_platform == 'drm' + if with_glx == 'xlib' or with_glx == 'gallium-xlib' + dep_x11 = dependency('x11') + dep_xext = dependency('xext') + dep_xcb = dependency('xcb') + elif with_glx == 'dri' dep_x11 = dependency('x11') dep_xext = dependency('xext') dep_xdamage = dependency('xdamage', version : '>= 1.1') @@ -800,9 +1141,13 @@ if with_platform_x11 dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1') dep_xxf86vm = dependency('xxf86vm', required : false) endif - if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') + if (with_any_vk or with_glx == 'dri' or + (with_gallium_vdpau or with_gallium_xvmc or with_gallium_omx or + with_gallium_xa)) dep_xcb = dependency('xcb') dep_x11_xcb = dependency('x11-xcb') + endif + if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8') if with_dri3 @@ -813,8 +1158,10 @@ if with_platform_x11 dep_xshmfence = dependency('xshmfence', version : '>= 1.1') endif endif - if with_glx != 'disabled' - dep_dri2proto = dependency('dri2proto', version : '>= 2.8') + if with_glx == 'dri' + if with_dri_platform == 'drm' + dep_dri2proto = dependency('dri2proto', version : '>= 2.8') + endif dep_glproto = dependency('glproto', version : '>= 1.4.14') endif if with_egl @@ -822,20 +1169,24 @@ if with_platform_x11 endif endif -# TODO: osmesa - -# TODO: vallium G3DVL - -# TODO: nine +if get_option('gallium-extra-hud') + pre_args += '-DHAVE_GALLIUM_EXTRA_HUD=1' +endif -# TODO: clover +_sensors = get_option('lmsensors') +if _sensors != 'false' + dep_lmsensors = cc.find_library('libsensors', required : _sensors == 'true') + if dep_lmsensors.found() + pre_args += '-DHAVE_LIBSENSORS=1' + endif +else + dep_lmsensors = [] +endif # TODO: gallium tests # TODO: various libdirs -# TODO: swr - # TODO: gallium driver dirs # FIXME: this is a workaround for #2326 @@ -876,7 +1227,7 @@ endif if dep_m.found() gl_priv_libs += '-lm' endif -if dep_dl.found() +if dep_dl != [] and dep_dl.found() gl_priv_libs += '-ldl' endif