[Mesa-dev] [PATCH 3/3] meson: Only GLX_USE_TLS when glx is in use

Alexander von Gluck IV kallisti5 at unixzen.com
Mon Feb 19 18:24:43 UTC 2018


---
 meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 6fc7ec7fc9..54572a5bb8 100644
--- a/meson.build
+++ b/meson.build
@@ -331,7 +331,6 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
   endif
 endif
 
-pre_args += '-DGLX_USE_TLS'
 if with_glx != 'disabled'
   if not (with_platform_x11 and with_any_opengl)
     if with_glx == 'auto'
@@ -365,6 +364,10 @@ if with_glvnd
   endif
 endif
 
+if with_glx != 'disabled'
+  pre_args += '-DGLX_USE_TLS'
+endif
+
 # TODO: toggle for this
 with_glx_direct = true
 
-- 
2.14.3



More information about the mesa-dev mailing list