[Mesa-dev] [PATCH 5/6] meson: add logic to select apple and windows dri

Jon Turney jon.turney at dronecode.org.uk
Tue Nov 21 14:25:42 UTC 2017


On 21/11/2017 00:50, Dylan Baker wrote:
> This is still not fully correct (haiku and BSD are probably not
> correct), but Linux is not regressed and this should be correct for
> macOS and Windows.
> 
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>   meson.build | 15 +++++++++++++--
>   1 file changed, 13 insertions(+), 2 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 52f2c1cb0d0..e7d2afb3d0a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -187,8 +187,19 @@ if with_dri_i915
>     dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75')
>   endif
>   
> -# TODO: other OSes
> -with_dri_platform = 'drm'
> +# TODO: gnu
> +if host_machine.system() == 'darwin'
> +  with_dri_platform = 'apple'
> +elif host_machine.system() == 'windows'

This should be:

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.
> +  with_dri_platform = 'none'
> +endif
>   
>   with_platform_android = false
>   with_platform_wayland = false
> 



More information about the mesa-dev mailing list