Module: Mesa Branch: main Commit: a97cc64c44e9ead2c4d5cc53d4d6de9badf50acf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a97cc64c44e9ead2c4d5cc53d4d6de9badf50acf
Author: Mark Collins <m...@igalia.com> Date: Tue Nov 7 16:43:47 2023 +0000 meson: Only link libvdrm to Turnip with virtio KMD `libvdrm` is unconditionally linked to `libvulkan_freedreno` which isn't available without the `virtio` subdirectory being included. It has been gated behind the `virtio` KMD to prevent linking errors in other cases as it's not necessary. Signed-off-by: Mark Collins <m...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26100> --- src/freedreno/vulkan/meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index 5dac85c38dc..0697492a16a 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -45,6 +45,7 @@ libtu_includes = [ inc_freedreno, ] +tu_link_with = [] tu_deps = [] tu_flags = [] @@ -95,6 +96,7 @@ if freedreno_kmds.contains('virtio') inc_virtio_gpu, inc_virtio_vdrm, ] + tu_link_with += libvdrm tu_deps += dep_libdrm endif @@ -155,8 +157,7 @@ libvulkan_freedreno = shared_library( libfreedreno_ir3, libfreedreno_layout, libfreedreno_perfcntrs, - # TODO - libvdrm, + tu_link_with, ], dependencies : [ idep_libfreedreno_common,
