Mesa (master): meson: Use system_has_kms_drm in default driver selection
Eric Anholt
anholt at kemper.freedesktop.org
Fri Mar 9 18:25:00 UTC 2018
Module: Mesa
Branch: master
Commit: e30a165be274e399787ba7d44171567f3d93dcac
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e30a165be274e399787ba7d44171567f3d93dcac
Author: Greg V <greg at unrelenting.technology>
Date: Tue Mar 6 22:16:03 2018 +0300
meson: Use system_has_kms_drm in default driver selection
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
---
meson.build | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index c0e76707ea..3c63f38438 100644
--- a/meson.build
+++ b/meson.build
@@ -89,6 +89,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
@@ -98,7 +100,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'
@@ -142,7 +144,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'
@@ -190,7 +192,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
if host_machine.cpu_family().startswith('x86')
_vulkan_drivers = 'amd,intel'
else
More information about the mesa-commit
mailing list