[Mesa-dev] [PATCH v4 12/49] meson: don't build glx or dri by default on windows

[Eric Engestrom]

On Thursday, 2018-08-23 10:27:17 -0700, Dylan Baker wrote:
> Quoting Eric Engestrom (2018-08-23 10:13:17)
> > On Wednesday, 2018-08-22 10:04:35 -0700, Dylan Baker wrote:
> > > Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
> > > Reviewed-by: Eric Anholt <eric at anholt.net>
> > > ---
> > >  meson.build | 8 ++++++--
> > >  1 file changed, 6 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/meson.build b/meson.build
> > > index 1af610573d5..5102ffe0c7c 100644
> > > --- a/meson.build
> > > +++ b/meson.build
> > > @@ -264,8 +264,12 @@ if with_glx == 'auto'
> > >    elif with_platform_haiku
> > >      with_glx = 'disabled'
> > 
> > How about simply adding it here, before the with_gallium check?
> > 
> >   +  elif host_machine.system() == 'windows'
> >   +    with_glx = 'disabled'
> > 
> > Otherwise this opens the door to a weird `(gallium + x11 + gl - vk) on
> > windows` bug here.
> 
> I'm trying to understand the bug, if you build with windows dri you'll get
> glx? It seems like then really we should have the first option be "if
> with_dri and with_dri_platform == 'drm'" (or should it be "with_dri and not
> ['windows', 'apple'].contains(with_dri_platform)"?) and instead of simply
> with_dri, or am I missing something?

I just meant that it would be more robust to write it in that order, so
that if that combination ever becomes possible in the build system, this
doesn't cause any weird bugs.

That said, you can just ignore this, it wasn't really worth mentioning.

(and sorry for forgetting to reply)

> 
> Dylan
> 
> > With that:
> > Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
> > 
> > >    elif with_gallium
> > > -    # Even when building just gallium drivers the user probably wants dri
> > > -    with_glx = 'dri'
> > > +    if host_machine.system() == 'windows'
> > > +      with_glx = 'disabled'
> > > +    else
> > > +      # Even when building just gallium drivers the user probably wants dri
> > > +      with_glx = 'dri'
> > > +    endif
> > >    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
> > > -- 
> > > 2.18.0
> > > 
> > > _______________________________________________
> > > mesa-dev mailing list
> > > mesa-dev at lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/mesa-dev