X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=bc5996992a3aee1a5520cbb9cf3248d14ad63b6f;hb=175549e0e988d10f8277c30ae4e6b6d5fea702a4;hp=6c273ed20cfefa1c09ae0befaf7dff1c678f800a;hpb=c2dad6ca0a120ae133fe32925c20e1e9856132d9;p=mesa.git diff --git a/meson.build b/meson.build index 6c273ed20cf..bc5996992a3 100644 --- a/meson.build +++ b/meson.build @@ -47,6 +47,7 @@ with_valgrind = get_option('valgrind') with_libunwind = get_option('libunwind') with_asm = get_option('asm') 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.') @@ -112,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 @@ -119,14 +122,18 @@ 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 = 'radeonsi,nouveau,swrast' + _drivers = 'r300,r600,radeonsi,nouveau,virgl,svga,swrast' elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) - _drivers = 'pl111,vc4,vc5,freedreno,etnaviv,imx,swrast' + _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 @@ -138,6 +145,8 @@ 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') @@ -145,6 +154,10 @@ 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 endif @@ -171,30 +184,38 @@ if _vulkan_drivers != '' 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 +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) + 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 +elif system_has_kms_drm 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) + # FIXME: illumos ends up here as well with_dri_platform = 'none' endif @@ -206,7 +227,7 @@ with_platform_surfaceless = false egl_native_platform = '' _platforms = get_option('platforms') if _platforms == 'auto' - if ['linux'].contains(host_machine.system()) + if system_has_kms_drm _platforms = 'x11,wayland,drm,surfaceless' else error('Unknown OS, no platforms enabled. Patches gladly accepted to fix this.') @@ -229,7 +250,6 @@ if with_glx == 'auto' elif with_gallium # Even when building just gallium drivers the user probably wants dri with_glx = 'dri' - with_dri = true 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 @@ -238,6 +258,11 @@ if with_glx == 'auto' 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 @@ -249,10 +274,10 @@ endif with_gbm = get_option('gbm') if with_gbm == 'auto' and with_dri # TODO: or gallium - with_gbm = host_machine.system() == 'linux' + with_gbm = system_has_kms_drm elif with_gbm == 'true' - if not ['linux', 'bsd'].contains(host_machine.system()) - error('GBM only supports unix-like platforms') + if not system_has_kms_drm + error('GBM only supports DRM/KMS platforms') endif with_gbm = true else @@ -275,9 +300,13 @@ 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' @@ -324,15 +353,9 @@ endif with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm' with_dri3 = get_option('dri3') if with_dri3 == 'auto' - if host_machine.system() == 'linux' and with_dri2 - with_dri3 = true - else - with_dri3 = false - endif -elif with_dri3 == 'true' - with_dri3 = true + with_dri3 = system_has_kms_drm and with_dri2 else - with_dri3 = false + with_dri3 = with_dri3 == 'true' endif if with_any_vk and (with_platform_x11 and not with_dri3) @@ -344,21 +367,239 @@ 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 +prog_pkgconfig = find_program('pkg-config') + +dep_vdpau = [] +_vdpau = get_option('gallium-vdpau') +if _vdpau == 'auto' + if not system_has_kms_drm + 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 system_has_kms_drm + error('VDPAU state tracker can only be build on DRM/KMS 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 : run_command(prog_pkgconfig, ['vdpau', '--cflags']).stdout().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 system_has_kms_drm + 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 system_has_kms_drm + error('XVMC state tracker can only be build on DRM/KMS 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 : run_command(prog_pkgconfig, ['xvmc', '--cflags']).stdout().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 system_has_kms_drm + 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 system_has_kms_drm + error('OMX state tracker can only be built on DRM/KMS 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 : run_command(prog_pkgconfig, ['libomxil-bellagio', '--cflags']).stdout().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 system_has_kms_drm + 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 system_has_kms_drm + error('VA state tracker can only be built on DRM/KMS 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 : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().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 system_has_kms_drm + 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 system_has_kms_drm + error('XA state tracker can only be built on DRM/KMS 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 = [] @@ -375,6 +616,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 @@ -447,22 +690,26 @@ if cc.compiles('struct __attribute__((packed)) foo { int bar; };', endif if cc.compiles('int *foo(void) __attribute__((returns_nonnull));', name : '__attribute__((returns_nonnull))') - pre_args += '-DHAVE_FUNC_ATTRIBUTE_NONNULL' + pre_args += '-DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL' endif if cc.compiles('''int foo_def(void) __attribute__((visibility("default"))); int foo_hid(void) __attribute__((visibility("hidden"))); int foo_int(void) __attribute__((visibility("internal"))); int foo_pro(void) __attribute__((visibility("protected")));''', name : '__attribute__((visibility(...)))') - pre_args += '-DHAVE_FUNC_ATTRIBUTE_VISBILITY' + pre_args += '-DHAVE_FUNC_ATTRIBUTE_VISIBILITY' endif if cc.compiles('int foo(void) { return 0; } int bar(void) __attribute__((alias("foo")));', 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 @@ -484,11 +731,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' @@ -508,15 +769,8 @@ 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' + pre_args += '-DUSE_SSE41' with_sse41 = true sse41_args = ['-msse4.1'] @@ -564,23 +818,23 @@ with_asm_arch = '' if with_asm # TODO: SPARC and PPC if host_machine.cpu_family() == 'x86' - if ['linux', 'bsd'].contains(host_machine.system()) # FIXME: hurd? + if system_has_kms_drm with_asm_arch = 'x86' pre_args += ['-DUSE_X86_ASM', '-DUSE_MMX_ASM', '-DUSE_3DNOW_ASM', '-DUSE_SSE_ASM'] endif elif host_machine.cpu_family() == 'x86_64' - if host_machine.system() == 'linux' + if system_has_kms_drm with_asm_arch = 'x86_64' pre_args += ['-DUSE_X86_64_ASM'] endif elif host_machine.cpu_family() == 'arm' - if host_machine.system() == 'linux' + if system_has_kms_drm with_asm_arch = 'arm' pre_args += ['-DUSE_ARM_ASM'] endif elif host_machine.cpu_family() == 'aarch64' - if host_machine.system() == 'linux' + if system_has_kms_drm with_asm_arch = 'aarch64' pre_args += ['-DUSE_AARCH64_ASM'] endif @@ -600,7 +854,7 @@ foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h'] endif endforeach -foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get'] +foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get', 'memfd_create'] if cc.has_function(f) pre_args += '-DHAVE_@0@'.format(f.to_upper()) endif @@ -619,7 +873,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; }''', @@ -691,13 +945,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() != '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 @@ -710,9 +969,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 @@ -722,19 +982,29 @@ 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 or with_gallium_radeonsi +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 +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', modules : llvm_modules, - required : with_amd_vk or with_gallium_radeonsi, + required : with_amd_vk or with_gallium_radeonsi or with_gallium_swr or with_gallium_opencl, ) with_llvm = dep_llvm.found() elif _llvm == 'true' @@ -746,18 +1016,22 @@ else 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. + # Development versions of LLVM have an 'svn' or 'git' suffix, we don't want + # that for our version checks. + # svn suffixes are stripped by meson as of 0.43, and git suffixes are + # strippped as of 0.44, but we support older meson versions. _llvm_patch = _llvm_version[2] if _llvm_patch.endswith('svn') _llvm_patch = _llvm_patch.split('s')[0] + elif _llvm_patch.contains('git') + _llvm_patch = _llvm_patch.split('g')[0] endif pre_args += [ - '-DHAVE_LLVM=0x0@0@@1@@2@'.format(_llvm_version[0], _llvm_version[1], _llvm_patch), + '-DHAVE_LLVM=0x0@0@0@1@'.format(_llvm_version[0], _llvm_version[1]), '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch), ] -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.') +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 = [] @@ -861,7 +1135,7 @@ if with_platform_x11 dep_x11 = dependency('x11') dep_xext = dependency('xext') dep_xcb = dependency('xcb') - elif with_glx == 'dri' and with_dri_platform == 'drm' + elif with_glx == 'dri' dep_x11 = dependency('x11') dep_xext = dependency('xext') dep_xdamage = dependency('xdamage', version : '>= 1.1') @@ -869,9 +1143,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 @@ -883,7 +1161,9 @@ if with_platform_x11 endif endif if with_glx == 'dri' - dep_dri2proto = dependency('dri2proto', version : '>= 2.8') + 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 @@ -891,16 +1171,24 @@ if with_platform_x11 endif endif -# 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