Mesa (master): meson: add logic to select apple and windows dri

Dylan Baker dbaker at kemper.freedesktop.org
Wed Nov 22 20:50:44 UTC 2017


Module: Mesa
Branch: master
Commit: 33627d23d03ee6273c5aa874a85978777271582f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=33627d23d03ee6273c5aa874a85978777271582f

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Fri Oct 27 17:20:52 2017 -0700

meson: add logic to select apple and windows dri

This is still not fully correct (haiku and BSD is notably probably not
correct), but Linux is not regressed and this should be correct for
macOS and Windows.

v2: - set the dri_platform to windows on Cygwin as well (Jon)
v3: - Add a better todo for Hurd (Eric)

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

---

 meson.build | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index cba08682bc..d5a7c62266 100644
--- a/meson.build
+++ b/meson.build
@@ -187,8 +187,20 @@ if with_dri_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




More information about the mesa-commit mailing list