FreeBSD builds Mesa with --disable-glx-tls in autotools because:
https://github.com/dumbbell/test-tls-initial-exec
Add the equivalent option to Meson.
---
meson.build | 5 ++++-
meson_options.txt | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index e71f4ddd73..1c4293d464 100644
--- a/meson.build
+++ b/meson.build
@@ -329,7 +329,10 @@ if with_egl and not (with_platform_drm or
with_platform_surfaceless)
endif
endif
-pre_args += '-DGLX_USE_TLS'
+if get_option('glx-tls')
+ pre_args += '-DGLX_USE_TLS'
+endif
+
if with_glx != 'disabled'
if not (with_platform_x11 and with_any_opengl)
if with_glx == 'auto'
diff --git a/meson_options.txt b/meson_options.txt
index 7fafe2deaa..eaf23f6988 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -280,6 +280,12 @@ option(
value : 'avx,avx2',
description : 'Comma delemited swr architectures. choices : avx,avx2,knl,skx'
)
+option(
+ 'glx-tls',
+ type : 'boolean',
+ value : true,
+ description : 'Enable thread-local storage in GLX and EGL'
+)
option(
'tools',
type : 'string',
--
2.16.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
