i965: Allow mapped VBOs during drawing in non-debug contexts.

[mesa.git] / meson.build

diff --git a/meson.build b/meson.build
index 716976ccfc67cb9fdb5a0cfb6bac3aa1913bf021..bff40f697d37902f0f055865a0b96e36804087ce 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -73,10 +73,12 @@ endif
 
 with_dri = false
 with_dri_i965 = false
+with_dri_swrast = false
 _drivers = get_option('dri-drivers')
 if _drivers != ''
   _split = _drivers.split(',')
   with_dri_i965 = _split.contains('i965')
+  with_dri_swrast = _split.contains('swrast')
   with_dri = true
 endif
 
@@ -101,12 +103,15 @@ pre_args += '-DHAVE_LIBDRM'
 with_dri2 = with_dri_platform == 'drm' and dep_libdrm.found()
 with_dri3 = get_option('dri3')
 if with_dri3 == 'auto'
-  if host_machine.system() == 'linux'
+  if host_machine.system() == 'linux' and with_dri2
     with_dri3 = true
   else
     with_dri3 = false
  endif
 elif with_dri3 == 'yes'
+  if not with_dri2
+    error('dri3 support requires libdrm')
+  endif
   with_dri3 = true
 else
   with_dri3 = false
@@ -122,6 +127,18 @@ if _platforms != ''
   with_platform_wayland = _split.contains('wayland')
 endif
 
+with_gbm = get_option('gbm')
+if with_gbm == 'auto' and with_dri  # TODO: or gallium
+  with_gbm = host_machine.system() == 'linux'
+elif with_gbm == 'yes'
+  if not ['linux', 'bsd'].contains(host_machine.system())
+    error('GBM only supports unix-like platforms')
+  endif
+  with_gbm = true
+else
+  with_gbm = false
+endif
+
 with_glx = get_option('glx')
 if with_glx != 'disabled'
   pre_args += '-DGLX_USE_TLS'