From 65ffcee23db6c7c4202eaa1d9638062fd8b03a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Ondra=C4=8Dka?= Date: Tue, 3 May 2022 08:17:57 +0200 Subject: [PATCH] meson: build radeon drm-shim also for r300 and r600 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Right now the drm-shim is build only when one also builds radeonsi or radv. Acked-by: Pavel Ondračka Reviewed-by: Emma Anholt Signed-off-by: Pavel Ondračka Part-of: --- src/amd/meson.build | 14 ++++++++------ src/meson.build | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/amd/meson.build b/src/amd/meson.build index 37f9b57043750..f394f38f2cb29 100644 --- a/src/amd/meson.build +++ b/src/amd/meson.build @@ -20,12 +20,14 @@ inc_amd = include_directories('.') -subdir('addrlib') -subdir('common') -if with_llvm - subdir('llvm') -else - libamd_common_llvm = [] +if with_amd_vk or with_gallium_radeonsi + subdir('addrlib') + subdir('common') + if with_llvm + subdir('llvm') + else + libamd_common_llvm = [] + endif endif if with_amd_vk subdir('compiler') diff --git a/src/meson.build b/src/meson.build index 1e9a39b52df5e..e55104527750b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -84,7 +84,7 @@ endif if with_any_intel subdir('intel') endif -if with_gallium_radeonsi or with_amd_vk +if with_gallium_radeonsi or with_amd_vk or with_gallium_r300 or with_gallium_r600 subdir('amd') endif if with_any_broadcom