Re: [Mesa-dev] [Mesa-stable] [PATCH] egl/wayland: Always use in-tree wayland-egl-backend.h
On 16 February 2018 at 13:56, Emil Velikovwrote: > On 15 February 2018 at 13:13, Emil Velikov wrote: >> On 15 February 2018 at 09:23, Daniel Stone wrote: >>> A recent patchset to Wayland[0] migrated Mesa's libwayland-egl backend >>> into Wayland itself, so implementations could provide backends. Mesa >>> still uses its own, and the two have already diverged[1]. >>> >>> The include from egl_dri2.h could pick up either the installed Wayland >>> wayland-egl-backend.h (with a 'driver_private' member), or the Mesa >>> internal wayland-egl-backend.h (with a 'private' member), failing the >>> build in the first instance. >>> >>> Add an explicit directory prefix to the include, so we always get our >>> in-tree version. >>> >>> [0]: https://patchwork.freedesktop.org/series/31663/ >>> [1]: https://cgit.freedesktop.org/wayland/wayland/commit/?id=9fa60983b579 >>> >> Hmm in hind-sight, one could have fixed the "C++ issue" in a backward >> compatible manner. >> Let me try that instead - otherwise we need to port this patch to >> every mesa in existence :-\ > > Considering s/every mesa in existence/a couple odd versions/ + fix is > dead trivial, lets go with this. > This is way cleaner than my hack for wayland. > > Small nit - s/Fixes/Bugzilla/ > Reviewed-by: Emil Velikov Thanks a lot Emil, pushed now as ff5432dc5061. I tagged the original commit as Fixes, so hopefully it can make it in to 17.3.x as well as 18.0.0. Cheers, Daniel ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [Mesa-stable] [PATCH] egl/wayland: Always use in-tree wayland-egl-backend.h
On 15 February 2018 at 13:13, Emil Velikovwrote: > On 15 February 2018 at 09:23, Daniel Stone wrote: >> A recent patchset to Wayland[0] migrated Mesa's libwayland-egl backend >> into Wayland itself, so implementations could provide backends. Mesa >> still uses its own, and the two have already diverged[1]. >> >> The include from egl_dri2.h could pick up either the installed Wayland >> wayland-egl-backend.h (with a 'driver_private' member), or the Mesa >> internal wayland-egl-backend.h (with a 'private' member), failing the >> build in the first instance. >> >> Add an explicit directory prefix to the include, so we always get our >> in-tree version. >> >> [0]: https://patchwork.freedesktop.org/series/31663/ >> [1]: https://cgit.freedesktop.org/wayland/wayland/commit/?id=9fa60983b579 >> > Hmm in hind-sight, one could have fixed the "C++ issue" in a backward > compatible manner. > Let me try that instead - otherwise we need to port this patch to > every mesa in existence :-\ > Considering s/every mesa in existence/a couple odd versions/ + fix is dead trivial, lets go with this. This is way cleaner than my hack for wayland. Small nit - s/Fixes/Bugzilla/ Reviewed-by: Emil Velikov Thanks Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [Mesa-stable] [PATCH] egl/wayland: Always use in-tree wayland-egl-backend.h
On 15 February 2018 at 09:23, Daniel Stonewrote: > A recent patchset to Wayland[0] migrated Mesa's libwayland-egl backend > into Wayland itself, so implementations could provide backends. Mesa > still uses its own, and the two have already diverged[1]. > > The include from egl_dri2.h could pick up either the installed Wayland > wayland-egl-backend.h (with a 'driver_private' member), or the Mesa > internal wayland-egl-backend.h (with a 'private' member), failing the > build in the first instance. > > Add an explicit directory prefix to the include, so we always get our > in-tree version. > > [0]: https://patchwork.freedesktop.org/series/31663/ > [1]: https://cgit.freedesktop.org/wayland/wayland/commit/?id=9fa60983b579 > Hmm in hind-sight, one could have fixed the "C++ issue" in a backward compatible manner. Let me try that instead - otherwise we need to port this patch to every mesa in existence :-\ -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev