Re: [Mesa-dev] [PATCH v2] meson: add logic to select apple and windows dri
Quoting Eric Engestrom (2017-11-22 03:16:17) > On Tuesday, 2017-11-21 10:50:29 -0800, Dylan Baker wrote: > > Quoting Eric Engestrom (2017-11-21 10:38:25) > > > On Tuesday, 2017-11-21 10:21:07 -0800, Dylan Baker wrote: > > > > This is still not fully correct (haiku and BSD is notably probably not > > > > correct), but Linux is not regressed and this should be correct for > > > > macOS and Windows. > > > > > > > > v2: - set the dri_platform to windows on Cygwin as well (Jon) > > > > > > R-b stands > > > > > > > > > > > Signed-off-by: Dylan Baker> > > > --- > > > > meson.build | 15 +-- > > > > 1 file changed, 13 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/meson.build b/meson.build > > > > index 52f2c1cb0d0..4248cbcfd7e 100644 > > > > --- a/meson.build > > > > +++ b/meson.build > > > > @@ -187,8 +187,19 @@ if with_dri_i915 > > > >dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75') > > > > endif > > > > > > > > -# TODO: other OSes > > > > -with_dri_platform = 'drm' > > > > +# TODO: gnu > > > > > > I missed that comment the first time around; I don't understand what it > > > means? > > > > The autotools build has a handlers for setting the dri_platform to 'none' on > > gnu* (which I assume to be hurd). See configure.ac:1513 > > > > As far as I know meson doesn't support hurd ATM (though I doubt they'd turn > > away > > patches for it). > > > > We can drop the TODO if you'd prefer, I just like to note things in the > > autotools/scons build that aren't currently supported in the meson build. > > No, I think keeping the TODO is good to indicate something that is > handled by the other build system(s), even if they might never be > "fixed" (eg. if meson never gets ported to hurd). > > I guess this case is already covered by your `else` though, so maybe > move the comment there, and make it more than 3 letters? :P > > Don't let this stop you from pushing it though, it's really a nitpick ;) I went ahead and moved the FIXME into the else block and gave a longer (and hopefully better) comment than `gnu` Dylan signature.asc Description: signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH v2] meson: add logic to select apple and windows dri
On Tuesday, 2017-11-21 10:50:29 -0800, Dylan Baker wrote: > Quoting Eric Engestrom (2017-11-21 10:38:25) > > On Tuesday, 2017-11-21 10:21:07 -0800, Dylan Baker wrote: > > > This is still not fully correct (haiku and BSD is notably probably not > > > correct), but Linux is not regressed and this should be correct for > > > macOS and Windows. > > > > > > v2: - set the dri_platform to windows on Cygwin as well (Jon) > > > > R-b stands > > > > > > > > Signed-off-by: Dylan Baker> > > --- > > > meson.build | 15 +-- > > > 1 file changed, 13 insertions(+), 2 deletions(-) > > > > > > diff --git a/meson.build b/meson.build > > > index 52f2c1cb0d0..4248cbcfd7e 100644 > > > --- a/meson.build > > > +++ b/meson.build > > > @@ -187,8 +187,19 @@ if with_dri_i915 > > >dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75') > > > endif > > > > > > -# TODO: other OSes > > > -with_dri_platform = 'drm' > > > +# TODO: gnu > > > > I missed that comment the first time around; I don't understand what it > > means? > > The autotools build has a handlers for setting the dri_platform to 'none' on > gnu* (which I assume to be hurd). See configure.ac:1513 > > As far as I know meson doesn't support hurd ATM (though I doubt they'd turn > away > patches for it). > > We can drop the TODO if you'd prefer, I just like to note things in the > autotools/scons build that aren't currently supported in the meson build. No, I think keeping the TODO is good to indicate something that is handled by the other build system(s), even if they might never be "fixed" (eg. if meson never gets ported to hurd). I guess this case is already covered by your `else` though, so maybe move the comment there, and make it more than 3 letters? :P Don't let this stop you from pushing it though, it's really a nitpick ;) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH v2] meson: add logic to select apple and windows dri
Quoting Eric Engestrom (2017-11-21 10:38:25) > On Tuesday, 2017-11-21 10:21:07 -0800, Dylan Baker wrote: > > This is still not fully correct (haiku and BSD is notably probably not > > correct), but Linux is not regressed and this should be correct for > > macOS and Windows. > > > > v2: - set the dri_platform to windows on Cygwin as well (Jon) > > R-b stands > > > > > Signed-off-by: Dylan Baker> > --- > > meson.build | 15 +-- > > 1 file changed, 13 insertions(+), 2 deletions(-) > > > > diff --git a/meson.build b/meson.build > > index 52f2c1cb0d0..4248cbcfd7e 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -187,8 +187,19 @@ if with_dri_i915 > >dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75') > > endif > > > > -# TODO: other OSes > > -with_dri_platform = 'drm' > > +# TODO: gnu > > I missed that comment the first time around; I don't understand what it > means? The autotools build has a handlers for setting the dri_platform to 'none' on gnu* (which I assume to be hurd). See configure.ac:1513 As far as I know meson doesn't support hurd ATM (though I doubt they'd turn away patches for it). We can drop the TODO if you'd prefer, I just like to note things in the autotools/scons build that aren't currently supported in the meson build. Dylan signature.asc Description: signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH v2] meson: add logic to select apple and windows dri
On Tuesday, 2017-11-21 10:21:07 -0800, Dylan Baker wrote: > This is still not fully correct (haiku and BSD is notably probably not > correct), but Linux is not regressed and this should be correct for > macOS and Windows. > > v2: - set the dri_platform to windows on Cygwin as well (Jon) R-b stands > > Signed-off-by: Dylan Baker> --- > meson.build | 15 +-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/meson.build b/meson.build > index 52f2c1cb0d0..4248cbcfd7e 100644 > --- a/meson.build > +++ b/meson.build > @@ -187,8 +187,19 @@ if with_dri_i915 >dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75') > endif > > -# TODO: other OSes > -with_dri_platform = 'drm' > +# TODO: gnu I missed that comment the first time around; I don't understand what it means? > +if host_machine.system() == 'darwin' > + with_dri_platform = 'apple' > +elif ['windows', 'cygwin'].contains(host_machine.system()) > + with_dri_platform = 'windows' > +elif host_machine.system() == 'linux' > + # FIXME: This should include BSD and possibly other systems > + with_dri_platform = 'drm' > +else > + # FIXME: haiku doesn't use dri, and xlib doesn't use dri, probably should > + # assert here that one of those cases has been met. > + with_dri_platform = 'none' > +endif > > with_platform_android = false > with_platform_wayland = false > -- > 2.15.0 > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH v2] meson: add logic to select apple and windows dri
This is still not fully correct (haiku and BSD is notably probably not correct), but Linux is not regressed and this should be correct for macOS and Windows. v2: - set the dri_platform to windows on Cygwin as well (Jon) Signed-off-by: Dylan Baker--- meson.build | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 52f2c1cb0d0..4248cbcfd7e 100644 --- a/meson.build +++ b/meson.build @@ -187,8 +187,19 @@ if with_dri_i915 dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75') endif -# TODO: other OSes -with_dri_platform = 'drm' +# TODO: gnu +if host_machine.system() == 'darwin' + with_dri_platform = 'apple' +elif ['windows', 'cygwin'].contains(host_machine.system()) + with_dri_platform = 'windows' +elif host_machine.system() == 'linux' + # FIXME: This should include BSD and possibly other systems + with_dri_platform = 'drm' +else + # FIXME: haiku doesn't use dri, and xlib doesn't use dri, probably should + # assert here that one of those cases has been met. + with_dri_platform = 'none' +endif with_platform_android = false with_platform_wayland = false -- 2.15.0 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev