Quoting Brian Paul (2018-09-05 11:50:36) > On 09/05/2018 11:57 AM, 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.ba...@intel.com> > >>> Reviewed-by: Eric Anholt <e...@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' > > Is host_machine where the compiler's running? If so, this won't work if > using MinGW to build a Windows driver on Linux.
build_machine is where the compiler is running, host_machine is where the compiled binaries will run. meson has a target_machine, but that's only useful for doing a Canadian Cross, ie, where the output of the binaries will run. Dylan > > The logic should be something like "if target_system == windows, then > disable DRI/GLX". > > -Brian > > > > >> > >> Otherwise this opens the door to a weird `(gallium + x11 + gl - vk) on > >> windows` bug here. > >> > >> With that: > >> Reviewed-by: Eric Engestrom <eric.engest...@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@lists.freedesktop.org > >>> https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Fmesa-dev&data=02%7C01%7Cbrianp%40vmware.com%7C95cc38b18998418b9f5b08d6135938a3%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C1%7C0%7C636717671257955683&sdata=aVyR3XVXpuv9oWNQukAglwMrNXcIMzHvX6pGZNervbQ%3D&reserved=0 > > > > ping > > > > > > > > _______________________________________________ > > mesa-dev mailing list > > mesa-dev@lists.freedesktop.org > > https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Fmesa-dev&data=02%7C01%7Cbrianp%40vmware.com%7C95cc38b18998418b9f5b08d6135938a3%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C1%7C0%7C636717671257965692&sdata=b1TpPrR4bArl59o%2BXIdZfVVDIXIwx58JhAnKI1lD4XA%3D&reserved=0 > > >
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
