Reviewed-by: Dylan Baker <dy...@pnwbakers.com> Thanks for making those changes.
Quoting Eric Engestrom (2017-12-07 03:25:58)
> src/gallium/winsys/pl111/drm/libpl111winsys.a(pl111_drm_winsys.c.o): In
> function `pl111_drm_screen_create':
> pl111_drm_winsys.c:(.text+0x33): undefined reference to
> `vc4_drm_screen_create_renderonly'
>
> Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com>
> Reviewed-by: Dylan Baker <dy...@pnwbakers.com> (v1)
> ---
> (sent a v2 because the rebase wasn't completely trivial)
> v2: move error message with the imx/etnaviv one and reword it to match
> ---
> meson.build | 3 +++
> src/gallium/meson.build | 10 +++++-----
> src/gallium/winsys/pl111/drm/meson.build | 1 +
> 3 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 3e8ea7d17e06e9ededb0..1ea63fb12915c93a67d5 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -190,6 +190,9 @@ endif
> if with_gallium_imx and not with_gallium_etnaviv
> error('IMX driver requires etnaviv driver')
> endif
> +if with_gallium_pl111 and not with_gallium_vc4
> + error('pl111 driver requires vc4 driver')
> +endif
>
> dep_libdrm_intel = []
> if with_dri_i915 or with_gallium_i915
> diff --git a/src/gallium/meson.build b/src/gallium/meson.build
> index 7e841633a9c837658370..2baca8a97ca3cfe36ff1 100644
> --- a/src/gallium/meson.build
> +++ b/src/gallium/meson.build
> @@ -72,17 +72,17 @@ if with_gallium_freedreno
> else
> driver_freedreno = declare_dependency()
> endif
> -if with_gallium_pl111
> - subdir('winsys/pl111/drm')
> -else
> - driver_pl111 = declare_dependency()
> -endif
> if with_gallium_vc4
> subdir('winsys/vc4/drm')
> subdir('drivers/vc4')
> else
> driver_vc4 = declare_dependency()
> endif
> +if with_gallium_pl111
> + subdir('winsys/pl111/drm')
> +else
> + driver_pl111 = declare_dependency()
> +endif
> if with_gallium_vc5
> subdir('winsys/vc5/drm')
> subdir('drivers/vc5')
> diff --git a/src/gallium/winsys/pl111/drm/meson.build
> b/src/gallium/winsys/pl111/drm/meson.build
> index 8ba03e3f9795009c725d..9cb6faf31e21e57bd6ab 100644
> --- a/src/gallium/winsys/pl111/drm/meson.build
> +++ b/src/gallium/winsys/pl111/drm/meson.build
> @@ -27,6 +27,7 @@ libpl111winsys = static_library(
> ],
> c_args : [c_vis_args],
> dependencies: dep_libdrm,
> + link_with : libvc4winsys,
> )
>
> driver_pl111 = declare_dependency(
> --
> Cheers,
> Eric
>
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
