Commit f0337f0f authored by Eric Engestrom's avatar Eric Engestrom
Browse files

meson: fix pl111 dependency on vc4



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: default avatarEric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: default avatarDylan Baker <dylan@pnwbakers.com>
parent 5f81a435
...@@ -190,6 +190,9 @@ endif ...@@ -190,6 +190,9 @@ endif
if with_gallium_imx and not with_gallium_etnaviv if with_gallium_imx and not with_gallium_etnaviv
error('IMX driver requires etnaviv driver') error('IMX driver requires etnaviv driver')
endif endif
if with_gallium_pl111 and not with_gallium_vc4
error('pl111 driver requires vc4 driver')
endif
dep_libdrm_intel = [] dep_libdrm_intel = []
if with_dri_i915 or with_gallium_i915 if with_dri_i915 or with_gallium_i915
......
...@@ -72,17 +72,17 @@ if with_gallium_freedreno ...@@ -72,17 +72,17 @@ if with_gallium_freedreno
else else
driver_freedreno = declare_dependency() driver_freedreno = declare_dependency()
endif endif
if with_gallium_pl111
subdir('winsys/pl111/drm')
else
driver_pl111 = declare_dependency()
endif
if with_gallium_vc4 if with_gallium_vc4
subdir('winsys/vc4/drm') subdir('winsys/vc4/drm')
subdir('drivers/vc4') subdir('drivers/vc4')
else else
driver_vc4 = declare_dependency() driver_vc4 = declare_dependency()
endif endif
if with_gallium_pl111
subdir('winsys/pl111/drm')
else
driver_pl111 = declare_dependency()
endif
if with_gallium_vc5 if with_gallium_vc5
subdir('winsys/vc5/drm') subdir('winsys/vc5/drm')
subdir('drivers/vc5') subdir('drivers/vc5')
......
...@@ -27,6 +27,7 @@ libpl111winsys = static_library( ...@@ -27,6 +27,7 @@ libpl111winsys = static_library(
], ],
c_args : [c_vis_args], c_args : [c_vis_args],
dependencies: dep_libdrm, dependencies: dep_libdrm,
link_with : libvc4winsys,
) )
driver_pl111 = declare_dependency( driver_pl111 = declare_dependency(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment