[Mesa-dev] [PATCH 1/3] meson: Use system_has_kms_drm in default driver selection

[Dylan Baker]

Quoting Greg V (2018-03-06 11:16:03)
> ---
>  meson.build | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index d68460231c..e71f4ddd73 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -87,6 +87,8 @@ if (with_gles1 or with_gles2) and not with_opengl
>    error('building OpenGL ES without OpenGL is not supported.')
>  endif
>  
> +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system())
> +
>  with_dri = false
>  with_dri_i915 = false
>  with_dri_i965 = false
> @@ -96,7 +98,7 @@ with_dri_nouveau = false
>  with_dri_swrast = false
>  _drivers = get_option('dri-drivers')
>  if _drivers == 'auto'
> -  if host_machine.system() == 'linux'
> +  if system_has_kms_drm
>      # TODO: PPC, Sparc
>      if ['x86', 'x86_64'].contains(host_machine.cpu_family())
>        _drivers = 'i915,i965,r100,r200,nouveau'
> @@ -139,7 +141,7 @@ with_gallium_virgl = false
>  with_gallium_swr = false
>  _drivers = get_option('gallium-drivers')
>  if _drivers == 'auto'
> -  if host_machine.system() == 'linux'
> +  if system_has_kms_drm
>      # TODO: PPC, Sparc
>      if ['x86', 'x86_64'].contains(host_machine.cpu_family())
>        _drivers = 'r300,r600,radeonsi,nouveau,virgl,svga,swrast'
> @@ -179,7 +181,7 @@ with_amd_vk = false
>  with_any_vk = false
>  _vulkan_drivers = get_option('vulkan-drivers')
>  if _vulkan_drivers == 'auto'
> -  if host_machine.system() == 'linux'
> +  if system_has_kms_drm

Do vulkan drivers work on all of the BSDs?

>      if host_machine.cpu_family().startswith('x86')
>        _vulkan_drivers = 'amd,intel'
>      else
> @@ -217,8 +219,6 @@ 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())
> -- 
> 2.16.2
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180308/b7a11eec/attachment.sig>