On 1 December 2017 at 23:06, Dylan Baker <dy...@pnwbakers.com> wrote:
> There are some case where the dri3 loader is covering for underlinkage
> for GLX and EGL, provide the linkage that they actually need.
>
> Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
> ---
> src/egl/meson.build | 2 +-
> src/glx/meson.build | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/egl/meson.build b/src/egl/meson.build
> index f32715265ce..df6e8b49dac 100644
> --- a/src/egl/meson.build
> +++ b/src/egl/meson.build
> @@ -106,7 +106,7 @@ if with_platform_x11
> files_egl += files('drivers/dri2/platform_x11_dri3.c')
> link_for_egl += libloader_dri3_helper
> endif
> - deps_for_egl += [dep_xcb_dri2, dep_xcb_xfixes]
> + deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xfixes]
> endif
> if with_platform_drm
> files_egl += files('drivers/dri2/platform_drm.c')
> diff --git a/src/glx/meson.build b/src/glx/meson.build
> index 02bd79082fc..a73cf859666 100644
> --- a/src/glx/meson.build
> +++ b/src/glx/meson.build
> @@ -171,7 +171,8 @@ if with_glx == 'dri'
> link_args : [ld_args_bsymbolic, ld_args_gc_sections,
> extra_ld_args_libgl],
> dependencies : [
> dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11, dep_xcb_glx, dep_xcb,
> - dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, extra_deps_libgl,
> + dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xext, dep_xfixes,
> + dep_xdamage, extra_deps_libgl,
Slightly confused do we need dep_xcb_dri3? IIRC all that is part of loader_dri3.
With some confirmation on ^^ + the nitpick in 3/3 the series is
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
-Emil
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
