X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=593bfeebd5a584f09a930e58000b176c6ae0941c;hb=c0376a123418df0050dc45d3e1e84f6b29a6a1f3;hp=c9f96e7135d0320aeae9c5b15fa8158fd4138c10;hpb=c9b86cf52692f1d76314dce345080af8ce786792;p=mesa.git

diff --git a/meson.build b/meson.build
index c9f96e7135d..593bfeebd5a 100644
--- a/meson.build
+++ b/meson.build
@@ -61,6 +61,7 @@ if with_tools.contains('all')
     'freedreno',
     'glsl',
     'intel',
+    'intel-ui',
     'nir',
     'nouveau',
     'xvmc',
@@ -158,7 +159,7 @@ if gallium_drivers.contains('auto')
     elif ['arm', 'aarch64'].contains(host_machine.cpu_family())
       gallium_drivers = [
         'kmsro', 'v3d', 'vc4', 'freedreno', 'etnaviv', 'nouveau',
-        'tegra', 'virgl', 'lima', 'swrast'
+        'tegra', 'virgl', 'lima', 'panfrost', 'swrast'
       ]
     else
       error('Unknown architecture @0@. Please pass -Dgallium-drivers to set driver options. Patches gladly accepted to fix this.'.format(
@@ -252,6 +253,7 @@ endif
 
 if host_machine.system() == 'darwin'
   with_dri_platform = 'apple'
+  pre_args += '-DBUILDING_MESA'
 elif ['windows', 'cygwin'].contains(host_machine.system())
   with_dri_platform = 'windows'
 elif system_has_kms_drm
@@ -374,7 +376,11 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
   endif
 endif
 
-pre_args += '-DGLX_USE_TLS'
+# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+if not with_platform_android or get_option('platform-sdk-version') >= 29
+  pre_args += '-DUSE_ELF_TLS'
+endif
+
 if with_glx != 'disabled'
   if not (with_platform_x11 and with_any_opengl)
     error('Cannot build GLX support without X11 platform support and at least one OpenGL API')