From a1daeb87a8c8793b603b4b7a0418a0cd5185f913 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 24 Jun 2025 19:14:32 +0200 Subject: [PATCH] meson: fix vdrm inclusion logic This is about which driver use vdrm, not which OS we're on. Fixes the build on non-KMS/DRM system. Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12899 Part-of: --- meson.build | 7 +++++++ src/meson.build | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index fd4eb0b8af9..2752bc04561 100644 --- a/meson.build +++ b/meson.build @@ -287,6 +287,13 @@ if freedreno_kmds.length() != 0 and freedreno_kmds != [ 'msm' ] and with_freedre endif endif +with_vdrm = [ + with_amdgpu_virtio, + freedreno_kmds.contains('virtio'), + with_gallium_asahi, + with_asahi_vk, +].contains(true) + with_dri = false if with_gallium and system_has_kms_drm _glx = get_option('glx') diff --git a/src/meson.build b/src/meson.build index 15bbb233dd1..4f05fb63b8e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -69,7 +69,7 @@ endif if with_any_intel subdir('intel') endif -if system_has_kms_drm or with_gallium_virgl or with_virtio_vk +if with_vdrm or with_gallium_virgl or with_virtio_vk subdir('virtio') endif if with_gallium_radeonsi or with_amd_vk or with_gallium_r300 or with_gallium_r600