meson: Don't define HAVE_PTHREAD only on linux

[mesa.git] / meson.build

diff --git a/meson.build b/meson.build
index 3922733a073c2075e44b1d2b7434d7135926be2a..383ebb366625edf9f26256db160a7eab35fdb3af 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -152,7 +152,29 @@ if _drivers != ''
   with_gallium_etnaviv = _split.contains('etnaviv')
   with_gallium_imx = _split.contains('imx')
   with_gallium = true
-  with_dri = true
+endif
+
+with_intel_vk = false
+with_amd_vk = false
+with_any_vk = false
+_vulkan_drivers = get_option('vulkan-drivers')
+if _vulkan_drivers == 'auto'
+  if not ['darwin', 'windows'].contains(host_machine.system())
+    if host_machine.cpu_family().startswith('x86')
+      _vulkan_drivers = 'amd,intel'
+    else
+      error('Unknown architecture. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.')
+    endif
+  else
+    # No vulkan driver supports windows or macOS currently
+    _vulkan_drivers = ''
+  endif
+endif
+if _vulkan_drivers != ''
+  _split = _vulkan_drivers.split(',')
+  with_intel_vk = _split.contains('intel')
+  with_amd_vk = _split.contains('amd')
+  with_any_vk = with_amd_vk or with_intel_vk
 endif
 
 if with_dri_swrast and with_gallium_softpipe
@@ -192,7 +214,9 @@ if with_glx == 'auto'
   if with_dri
     with_glx = 'dri'
   elif with_gallium
-    with_glx = 'gallium-xlib'
+    # Even when building just gallium drivers the user probably wants dri
+    with_glx = 'dri'
+    with_dri = true
   elif with_platform_x11 and with_any_opengl and not with_any_vk
     # The automatic behavior should not be to turn on xlib based glx when
     # building only vulkan drivers
@@ -202,7 +226,7 @@ if with_glx == 'auto'
   endif
 endif
 
-if not (with_dri or with_gallium or with_glx == 'xlib')
+if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib')
   with_gles1 = false
   with_gles2 = false
   with_opengl = false
@@ -254,6 +278,8 @@ if with_glx != 'disabled'
   elif with_glx == 'gallium-xlib' 
     if not with_gallium
       error('Gallium-xlib based GLX requires at least one gallium driver')
+    elif not with_gallium_softpipe
+      error('Gallium-xlib based GLX requires softpipe or llvmpipe.')
     elif with_dri
       error('gallium-xlib conflicts with any dri driver')
     endif
@@ -282,32 +308,6 @@ if with_vulkan_icd_dir == ''
   with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
 endif
 
-with_intel_vk = false
-with_amd_vk = false
-with_any_vk = false
-_vulkan_drivers = get_option('vulkan-drivers')
-if _vulkan_drivers == 'auto'
-  if not ['darwin', 'windows'].contains(host_machine.system())
-    if host_machine.cpu_family().startswith('x86')
-      _vulkan_drivers = 'amd,intel'
-    else
-      error('Unknown architecture. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.')
-    endif
-  else
-    # No vulkan driver supports windows or macOS currently
-    _vulkan_drivers = ''
-  endif
-endif
-if _vulkan_drivers != ''
-  _split = _vulkan_drivers.split(',')
-  with_intel_vk = _split.contains('intel')
-  with_amd_vk = _split.contains('amd')
-  with_any_vk = with_amd_vk or with_intel_vk
-  if not (with_platform_x11 or with_platform_wayland or with_platform_android)
-    error('Vulkan requires at least one platform (x11, wayland, android)')
-  endif
-endif
-
 with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm'
 with_dri3 = get_option('dri3')
 if with_dri3 == 'auto'
@@ -353,11 +353,8 @@ if with_platform_x11
   if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
     pre_args += '-DHAVE_X11_PLATFORM'
   endif
-  if with_glx == 'xlib'
+  if with_glx == 'xlib' or with_glx == 'gallium-xlib'
     pre_args += '-DUSE_XSHM'
-  elif with_glx == 'gallium-xlib'
-    # TODO
-    error('TODO')
   else
     pre_args += '-DGLX_INDIRECT_RENDERING'
     if with_glx_direct
@@ -581,7 +578,7 @@ foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h']
   endif
 endforeach
 
-foreach f : ['strtof', 'mkostemp', 'posix_memalign']
+foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get']
   if cc.has_function(f)
     pre_args += '-DHAVE_@0@'.format(f.to_upper())
   endif
@@ -671,7 +668,7 @@ endif
 # TODO: some of these may be conditional
 dep_zlib = dependency('zlib', version : '>= 1.2.3')
 dep_thread = dependency('threads')
-if dep_thread.found() and host_machine.system() == 'linux'
+if dep_thread.found() and host_machine.system() != 'windows'
   pre_args += '-DHAVE_PTHREAD'
 endif
 dep_elf = dependency('libelf', required : false)
@@ -837,7 +834,7 @@ dep_xcb_sync = []
 dep_xcb_xfixes = []
 dep_xshmfence = []
 if with_platform_x11
-  if with_glx == 'xlib'
+  if with_glx == 'xlib' or with_glx == 'gallium-xlib'
     dep_x11 = dependency('x11')
     dep_xext = dependency('xext')
     dep_xcb = dependency('xcb')
@@ -925,7 +922,7 @@ endif
 if dep_m.found()
   gl_priv_libs += '-lm'
 endif
-if dep_dl.found()
+if dep_dl != [] and dep_dl.found()
   gl_priv_libs += '-ldl'
 endif