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

Dylan Baker dylan at pnwbakers.com
Tue Feb 20 18:12:07 UTC 2018


Quoting Dylan Baker (2018-02-20 10:09:53)
> Quoting Alexander von Gluck IV (2018-02-19 10:24:43)
> > ---
> >  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
> 
> Can we fold this into the above "if with_glx != 'disabled'" check?
> 
> With that fixed this patch is:
> Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
> 
> Dylan

I really should read patch series in backwards order... Emil's evaluation of the
situation is spot on, so please do that instead.

Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180220/8be3914b/attachment.sig>


More information about the mesa-dev mailing list